From 45d49c2d6ed8c673fb227d71ad3dfcb34f0d4663 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Wed, 1 Nov 2017 17:24:13 -0400
Subject: [PATCH] Tests: Fix FullClusterRestartIT.testSnapshotRestore test
 failing in 6.x

We switched to using index_patterns in 6.0.0, so we need to expect index_patterns there.

Closes #27213
---
 .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
index 2983312ff95c0..d57b1023e9a58 100644
--- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
+++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
@@ -857,7 +857,7 @@ private void checkSnapshot(String snapshotName, int count, Version tookOnVersion
         // Check that the template was restored successfully
         map = toMap(client().performRequest("GET", "/_template/test_template"));
         expected = new HashMap<>();
-        if (runningAgainstOldCluster) {
+        if (runningAgainstOldCluster && oldClusterVersion.before(Version.V_6_0_0_beta1)) {
             expected.put("template", "evil_*");
         } else {
             expected.put("index_patterns", singletonList("evil_*"));