[ML] Unmute DF analytics bwc tests and fix versions (#53850)

... after backporting #53788
elastic · Mar 20, 2020 · 687c888 · 687c888
1 parent 561222b
commit 687c888
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/...rc/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java b/...rc/main/java/org/elasticsearch/xpack/core/ml/action/GetDataFrameAnalyticsStatsAction.java
@@ -203,7 +203,7 @@ public Stats(StreamInput in) throws IOException {
                 } else {
                     memoryUsage = null;
                 }
-                if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+                if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
                     analysisStats = in.readOptionalNamedWriteable(AnalysisStats.class);
                 } else {
                     analysisStats = null;
@@ -334,7 +334,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
                     out.writeOptionalWriteable(memoryUsage);
                 }
-                if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+                if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
                     out.writeOptionalNamedWriteable(analysisStats);
                 }
                 out.writeOptionalWriteable(node);

diff --git a/...e/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml b/...e/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/53788"
-
 ---
 "Get old outlier_detection job":
 

diff --git a/...ade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml b/...ade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/53788"
 
   - do:
       index:

diff --git a/...rc/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml b/...rc/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      version: "all"
-      reason:  "Until backport of https://github.com/elastic/elasticsearch/pull/53788"
-
 ---
 "Get old cluster outlier_detection job":