Browse Source

Fix failing delete index test

This test is failing because delete /{index} requests no longer support
index matching an alias. This commit removes testing such requests again
aliases.

Closes #25284
Jason Tedor 8 years ago
parent
commit
4c28e781dd

+ 1 - 2
core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java

@@ -119,7 +119,6 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItem;
 
 
 @ClusterScope(scope = Scope.SUITE, numClientNodes = 1, minNumDataNodes = 2)
 @ClusterScope(scope = Scope.SUITE, numClientNodes = 1, minNumDataNodes = 2)
-@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/25284")
 public class IndicesRequestIT extends ESIntegTestCase {
 public class IndicesRequestIT extends ESIntegTestCase {
 
 
     private final List<String> indices = new ArrayList<>();
     private final List<String> indices = new ArrayList<>();
@@ -488,7 +487,7 @@ public class IndicesRequestIT extends ESIntegTestCase {
     public void testDeleteIndex() {
     public void testDeleteIndex() {
         interceptTransportActions(DeleteIndexAction.NAME);
         interceptTransportActions(DeleteIndexAction.NAME);
 
 
-        String[] randomIndicesOrAliases = randomUniqueIndicesOrAliases();
+        String[] randomIndicesOrAliases = randomUniqueIndices();
         DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(randomIndicesOrAliases);
         DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(randomIndicesOrAliases);
         assertAcked(internalCluster().coordOnlyNodeClient().admin().indices().delete(deleteIndexRequest).actionGet());
         assertAcked(internalCluster().coordOnlyNodeClient().admin().indices().delete(deleteIndexRequest).actionGet());