[activemq-artemis] branch master updated: NO-JIRA Fixing intermittent failures on BridgeTest

[clebertsuconic]

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

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 0abe7e7  NO-JIRA Fixing intermittent failures on BridgeTest
0abe7e7 is described below

commit 0abe7e7bc020b28563028a58e39aa462f08fea78
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Thu Apr 16 12:02:55 2020 -0400

    NO-JIRA Fixing intermittent failures on BridgeTest
---
 .../artemis/tests/integration/cluster/bridge/BridgeTest.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index e734042..63de32c 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -751,7 +751,8 @@ public class BridgeTest extends ActiveMQTestBase {
 
       server1.start();
 
-      Thread.sleep(1000);
+      Wait.assertTrue(server1::isActive);
+
 
       ClientSessionFactory sf1 = locator.createSessionFactory(server1tc);
 
@@ -885,8 +886,6 @@ public class BridgeTest extends ActiveMQTestBase {
          tx.commit();
       }
 
-      Thread.sleep(100);
-
 
       ClientSessionFactory sf1 = locator.createSessionFactory(server1tc);
 
@@ -1578,8 +1577,8 @@ public class BridgeTest extends ActiveMQTestBase {
                   public void run() {
                      try {
                         System.out.println("Stopping server");
-                        latch.countDown();
                         serverToStop.fail(false);
+                        latch.countDown();
                      } catch (Exception e) {
                         e.printStackTrace();
                      }