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

[do-not-reply at jboss.org]

Author: ataylor
Date: 2012-02-17 09:47:06 -0500 (Fri, 17 Feb 2012)
New Revision: 12135

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
Log:
fixed FailBackManualTest

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java	2012-02-17 13:44:48 UTC (rev 12134)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java	2012-02-17 14:47:06 UTC (rev 12135)
@@ -83,10 +83,6 @@
 
       session.removeFailureListener(listener);
 
-      listener = new CountDownSessionFailureListener(1);
-
-      session.addFailureListener(listener);
-
       liveConfig.setAllowAutoFailBack(false);
 
       Thread t = new Thread(new ServerStarter(liveServer));
@@ -97,18 +93,12 @@
 
       assertTrue(backupServer.isStarted());
 
-      backupServer.stop();
+      backupServer.crash();
 
-      assertTrue(listener.getLatch().await(15, TimeUnit.SECONDS));
+      waitForServer(liveServer.getServer());
 
-      message = session.createMessage(true);
+      assertTrue(liveServer.isStarted());
 
-      setBody(1, message);
-
-      producer.send(message);
-
-      session.close();
-
       sf.close();
 
       Assert.assertEquals(0, sf.numSessions());
@@ -116,6 +106,31 @@
       Assert.assertEquals(0, sf.numConnections());
    }
 
+   protected void waitForBackup(ClientSessionFactoryInternal sf, int toWait)
+            throws Exception
+   {
+      long time = System.currentTimeMillis();
+      while (sf.getBackupConnector() == null)
+      {
+         try
+         {
+            Thread.sleep(100);
+         }
+         catch (InterruptedException e)
+         {
+            //ignore
+         }
+         if (sf.getBackupConnector() != null)
+         {
+            break;
+         }
+         else if (System.currentTimeMillis() > (time + toWait))
+         {
+            fail("backup server never started");
+         }
+      }
+      System.out.println("sf.getBackupConnector() = " + sf.getBackupConnector());
+   }
 
    @Override
    protected void createConfigs() throws Exception