[zookeeper] Diff for: [GitHub] asfgit closed pull request #723: ZOOKEEPER-3202: Add timing margin to improve reliability of testClientServerSSL()

[GitBox <gi...@apache.org>]

diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java
index 08ffb4eef5..b5c5d4dec7 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientSSLTest.java
@@ -93,6 +93,10 @@ public void testClientServerSSL() throws Exception {
             mt[i].start();
         }
 
+        // Add some timing margin for the quorum to elect a leader
+        // (without this margin, timeouts have been observed in parallel test runs)
+        ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[0], 2 * TIMEOUT);
+
         // Servers have been set up. Now go test if secure connection is successful.
         for (int i = 0; i < SERVER_COUNT; i++) {
             Assert.assertTrue("waiting for server " + i + " being up",


With regards,
Apache Git Services