accept error messages from multiple versions

idegtiarenko · Nov 8, 2023 · 4b0c3c6 · 4b0c3c6
1 parent 3164751
commit 4b0c3c6
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...g-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java b/...g-upgrade-multi-cluster/src/test/java/org/elasticsearch/upgrades/CcrRollingUpgradeIT.java
@@ -21,6 +21,8 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.rest.action.search.RestSearchAction.TOTAL_HITS_AS_INT_PARAM;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -224,8 +226,20 @@ public void testCannotFollowLeaderInUpgradedCluster() throws Exception {
                 ResponseException.class,
                 () -> followIndex(leaderClient(), "follower", "not_supported", "not_supported")
             );
-            assertThat(e.getMessage(), containsString("the snapshot was created with index version ["));
-            assertThat(e.getMessage(), containsString("] which is higher than the version used by this node ["));
+
+            assertThat(
+                e.getMessage(),
+                allOf(
+                    anyOf(
+                        containsString("the snapshot was created with Elasticsearch version ["),
+                        containsString("the snapshot was created with index version [")
+                    ),
+                    anyOf(
+                        containsString("] which is higher than the version used by this node ["),
+                        containsString("] which is higher than the version of this node [")
+                    )
+                )
+            );
         } else if (clusterName == ClusterName.LEADER) {
             // At this point all nodes in both clusters have been updated and
             // the leader cluster can now follow not_supported index in the follower cluster: