You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/01/29 03:49:32 UTC
lucene-solr:master: SOLR-11617: Fix test: delete aliases without
async in tearDown
Repository: lucene-solr
Updated Branches:
refs/heads/master d85a1666a -> 00d453d27
SOLR-11617: Fix test: delete aliases without async in tearDown
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/00d453d2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/00d453d2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/00d453d2
Branch: refs/heads/master
Commit: 00d453d27c36b9c52928b5ccd1946a2e2aee5c75
Parents: d85a166
Author: David Smiley <ds...@apache.org>
Authored: Sun Jan 28 22:48:04 2018 -0500
Committer: David Smiley <ds...@apache.org>
Committed: Sun Jan 28 22:48:13 2018 -0500
----------------------------------------------------------------------
.../src/test/org/apache/solr/cloud/AliasIntegrationTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/00d453d2/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
index e2e155f..1093fcd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
@@ -86,14 +86,10 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
// make sure all aliases created are removed for the next test method
Map<String, String> aliases = new CollectionAdminRequest.ListAliases().process(cluster.getSolrClient()).getAliases();
for (String alias : aliases.keySet()) {
- CollectionAdminRequest.deleteAlias(alias).processAsync(cluster.getSolrClient());
+ CollectionAdminRequest.deleteAlias(alias).process(cluster.getSolrClient());
}
- // make sure all collections are removed for the next test method
- List<String> collections = CollectionAdminRequest.listCollections(cluster.getSolrClient());
- for (String collection : collections) {
- CollectionAdminRequest.deleteCollection(collection).process(cluster.getSolrClient());
- }
+ cluster.deleteAllCollections();
}
@Test