|
52 | 52 | import static org.elasticsearch.cluster.routing.UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING; |
53 | 53 | import static org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider.INDEX_ROUTING_ALLOCATION_ENABLE_SETTING; |
54 | 54 | import static org.elasticsearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY; |
55 | | -import static org.hamcrest.Matchers.either; |
56 | 55 | import static org.hamcrest.Matchers.equalTo; |
57 | 56 | import static org.hamcrest.Matchers.hasSize; |
58 | 57 | import static org.hamcrest.Matchers.is; |
59 | 58 | import static org.hamcrest.Matchers.isIn; |
60 | 59 | import static org.hamcrest.Matchers.notNullValue; |
61 | 60 | import static org.hamcrest.Matchers.nullValue; |
| 61 | +import static org.hamcrest.Matchers.oneOf; |
62 | 62 |
|
63 | 63 | /** |
64 | 64 | * In depth testing of the recovery mechanism during a rolling restart. |
@@ -568,7 +568,7 @@ private void assertClosedIndex(final String index, final boolean checkRoutingTab |
568 | 568 | for (Map<String, ?> shard : shards) { |
569 | 569 | assertThat(XContentMapValues.extractValue("shard", shard), equalTo(i)); |
570 | 570 | assertThat((String) XContentMapValues.extractValue("state", shard), |
571 | | - either(equalTo("STARTED")).or(equalTo("RELOCATED"))); |
| 571 | + oneOf("STARTED", "RELOCATING", "RELOCATED")); |
572 | 572 | assertThat(XContentMapValues.extractValue("index", shard), equalTo(index)); |
573 | 573 | } |
574 | 574 | } |
|
0 commit comments