[solr] branch main updated: Test fix: CollectionPropsTest.java was flaky (#468)

[dsmiley]

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

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new c146ad8  Test fix: CollectionPropsTest.java was flaky (#468)
c146ad8 is described below

commit c146ad8fd3b474f611e8062f27b2b6faa06d12b5
Author: mariemat <mathieu.ma...@gmail.com>
AuthorDate: Wed Dec 22 16:55:09 2021 +0100

    Test fix: CollectionPropsTest.java was flaky (#468)
    
    Was depending on log level; flappy/flaky test.  Broken by LUCENE-7788 that 
made sweeping changes everywhere to logging.
    Co-authored-by: Mathieu Marie <mma...@salesforce.com>
---
 solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java 
b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
index 25c86e0..b8ddb39 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
@@ -201,9 +201,8 @@ public class CollectionPropsTest extends SolrCloudTestCase {
     // Trigger a value change event
     log.info("setting value2");
     collectionProps.setCollectionProperty(collectionName, "property", 
"value2");
-    if (log.isInfoEnabled()) {
-      log.info("(value2) waitForTrigger=={}", watcher.waitForTrigger());
-    }
+    int wft = watcher.waitForTrigger();
+    log.info("(value2) waitForTrigger=={}", wft);
     assertEquals("value2", watcher.getProps().get("property"));
 
     // Delete the properties znode