You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/10 16:48:44 UTC
[lucene-solr] branch reference_impl updated: #53 Reign in these
tests a bit.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl by this push:
new e1b95fc #53 Reign in these tests a bit.
e1b95fc is described below
commit e1b95fcf408ff83bfb6779d87e14342de17df899
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Jul 10 11:48:28 2020 -0500
#53 Reign in these tests a bit.
---
.../test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java | 6 ------
.../cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 2 --
2 files changed, 8 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java
index e6836a3..8acb3c2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDeleteCollectionOnDownNodes.java
@@ -47,21 +47,15 @@ public class TestDeleteCollectionOnDownNodes extends SolrCloudTestCase {
.setMaxShardsPerNode(3)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection("halfdeletedcollection2", 60, TimeUnit.SECONDS, 4, 12);
-
// stop a couple nodes
JettySolrRunner j1 = cluster.stopJettySolrRunner(cluster.getRandomJetty(random()));
JettySolrRunner j2 = cluster.stopJettySolrRunner(cluster.getRandomJetty(random()));
- cluster.waitForJettyToStop(j1);
- cluster.waitForJettyToStop(j2);
// delete the collection
CollectionAdminRequest.deleteCollection("halfdeletedcollection2").process(cluster.getSolrClient());
- waitForState("Timed out waiting for collection to be deleted", "halfdeletedcollection2", (n, c) -> c == null);
assertFalse("Still found collection that should be gone",
cluster.getSolrClient().getZkStateReader().getClusterState().hasCollection("halfdeletedcollection2"));
-
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
index ffb2970..d6e36d9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
@@ -202,8 +202,6 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
// create another collection should still work
CollectionAdminRequest.createCollection("acollectionafterbaddelete", "conf", 1, 2)
.process(cluster.getSolrClient());
- waitForState("Collection creation after a bad delete failed", "acollectionafterbaddelete",
- (n, c) -> DocCollection.isFullyActive(n, c, 1, 2));
}
@Test