You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2020/06/10 03:01:14 UTC

[lucene-solr] branch master updated: few more awaitsfix

This is an automated email from the ASF dual-hosted git repository.

mdrob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 2660139  few more awaitsfix
2660139 is described below

commit 2660139aa3e5e7231bc4937c22e6e7ac067e8dbc
Author: Mike Drob <md...@apache.org>
AuthorDate: Tue Jun 9 22:00:18 2020 -0500

    few more awaitsfix
---
 .../org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java     | 1 +
 .../src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java | 1 +
 .../apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index 3b95b11..eeab99d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -777,6 +777,7 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
   public ExpectedException exception = ExpectedException.none();
 
   @Test
+  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12823")
   public void testWrongZkChrootTest() throws IOException {
 
     exception.expect(SolrException.class);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index d6aec62..320c371 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -761,6 +761,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
   public ExpectedException exception = ExpectedException.none();
 
   @Test
+  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12823")
   public void testWrongZkChrootTest() throws IOException {
     try (CloudSolrClient client = getCloudSolrClient(cluster.getZkServer().getZkAddress() + "/xyz/foo")) {
       client.setZkClientTimeout(1000 * 60);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
index 4289ebf..cabebee 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
@@ -31,6 +31,7 @@ import org.junit.Test;
 public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
 
   @Test
+  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12823")
   public void testCloudClientCanConnectAfterClusterComesUp() throws Exception {
 
     // Start by creating a cluster with no jetties
@@ -58,6 +59,7 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
   }
 
   @Test
+  @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12823")
   public void testCloudClientUploads() throws Exception {
 
     Path configPath = getFile("solrj").toPath().resolve("solr/configsets/configset-2/conf");