[hornetq-commits] JBoss hornetq SVN: r12187 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution.

[do-not-reply at jboss.org]

Author: jbertram
Date: 2012-02-23 16:10:49 -0500 (Thu, 23 Feb 2012)
New Revision: 12187

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
Log:
[HORNETQ-866] TwoWayTwoNodeClusterTest broken

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java	2012-02-23 14:58:13 UTC (rev 12186)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/TwoWayTwoNodeClusterTest.java	2012-02-23 21:10:49 UTC (rev 12187)
@@ -49,6 +49,22 @@
       setupClusterConnection("cluster1", 1, 0, "queues", false, 1, isNetty(), false);
    }
 
+   @Override
+   protected void tearDown() throws Exception
+   {
+      log.info("#test tearDown");
+      closeAllConsumers();
+
+      closeAllSessionFactories();
+
+      closeAllServerLocatorsFactories();
+
+      stopServers(0, 1);
+
+      super.tearDown();
+   }
+
+
    protected boolean isNetty()
    {
       return false;
@@ -130,11 +146,11 @@
             log.info("#stop #test #" + i);
             stopServers(1);
 
-            waitForTopology(servers[0], 1, 2000);
+            waitForTopology(servers[0], 1, -1, 2000);
             log.info("#start #test #" + i);
             startServers(1);
-            waitForTopology(servers[0], 2, 2000);
-            waitForTopology(servers[1], 2, 2000);
+            waitForTopology(servers[0], 2, -1, 2000);
+            waitForTopology(servers[1], 2, -1, 2000);
          }
       }
       finally