[BUG] Fix cat.health test failures in pre 1.0.0 mixed cluster test (#928

) (#935) Fixes the cat.health yaml failures when running in a bwc mixed cluster with legacy (pre 1.0.0) nodes. Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Jul 2, 2021 · 34550c5 · 34550c5
1 parent 23b69e5
commit 34550c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml
@@ -1,5 +1,8 @@
 ---
 "Help":
+  - skip:
+        version: " - 7.10.99"
+        reason: "discovered_master added in OpenSearch 1.0.0"
   - do:
       cat.health:
         help: true
@@ -27,7 +30,9 @@
 
 ---
 "Empty cluster":
-
+  - skip:
+      version: " - 7.10.99"
+      reason: "discovered_master added in OpenSearch 1.0.0"
   - do:
       cat.health: {}
 
@@ -56,7 +61,9 @@
 
 ---
 "With ts parameter":
-
+  - skip:
+      version: " - 7.10.99"
+      reason: "discovered_master added in OpenSearch 1.0.0"
   - do:
       cat.health:
         ts: false

diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
@@ -2013,7 +2013,8 @@ public void testHandshakeUpdatesVersion() throws IOException {
                 TransportRequestOptions.Type.REG,
                 TransportRequestOptions.Type.STATE);
             try (Transport.Connection connection = serviceA.openConnection(node, builder.build())) {
-                assertEquals(connection.getVersion(), version);
+                // OpenSearch 1.0+ in bwc mode should only "upgrade" to Legacy v7.10.2
+                assertEquals(connection.getVersion(), version.onOrAfter(Version.V_1_0_0) ? LegacyESVersion.V_7_10_2 : version);
             }
         }
     }