[jboss-cvs] JBoss Messaging SVN: r2957 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-08-06 11:30:34 -0400 (Mon, 06 Aug 2007)
New Revision: 2957

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
Log:
Test speedup


Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-08-06 15:17:20 UTC (rev 2956)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-08-06 15:30:34 UTC (rev 2957)
@@ -305,8 +305,6 @@
          {
             conn.close();
          }
-
-         ServerManagement.start(1, "all");
       }
    }
 
@@ -318,8 +316,6 @@
 
       Connection conn = null;
 
-      boolean killed = false;
-
       try
       {
          conn = createConnectionOnServer(cf, 1);
@@ -372,8 +368,6 @@
 
          ServerManagement.kill(1);
 
-         killed = true;
-
          // wait for the client-side failover to complete
 
          while(true)
@@ -431,12 +425,6 @@
                e.printStackTrace();
             }
          }
-
-         // Resurrect dead server
-         if (killed)
-         {
-            ServerManagement.start(1, "all");
-         }
       }
 
    }
@@ -449,8 +437,6 @@
      
       Connection conn = null;
 
-      boolean killed = false;
-
       try
       {
          //Get a connection on server 1
@@ -507,8 +493,6 @@
          
          ServerManagement.kill(1);
 
-         killed = true;
-
          //       wait for the client-side failover to complete
 
          while(true)
@@ -564,13 +548,7 @@
                e.printStackTrace();
             }
          }
-
-         if (killed)
-         {
-            ServerManagement.start(1, "all");
-         }
       }
-
    }
 
    public void testTopicSubscriber() throws Exception
@@ -612,6 +590,8 @@
 
          JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
 
+         ServerManagement.kill(1);
+
          // wait for the client-side failover to complete
 
          while(true)