Browse Source

Reindex search response fix (#49301)

Fixed test case to also accept another error message, now that reindex
does not allow searching against red shards.

Closes #49295
Henning Andersen 6 years ago
parent
commit
f2cba4ec55

+ 2 - 2
modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java

@@ -90,7 +90,6 @@ public class ReindexFailureTests extends ReindexTestCase {
      * the whole process. We do lose some information about how far along the
      * process got, but its important that they see these failures.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/49295")
     public void testResponseOnSearchFailure() throws Exception {
         /*
          * Attempt to trigger a reindex failure by deleting the source index out
@@ -122,7 +121,8 @@ public class ReindexFailureTests extends ReindexTestCase {
                         either(containsString("all shards failed"))
                         .or(containsString("No search context found"))
                         .or(containsString("no such index [source]"))
-                        );
+                        .or(containsString("Failed to execute phase [query], Partial shards failure"))
+                );
                 return;
             }
         }