[jboss-cvs] JBoss Messaging SVN: r2368 - trunk/tests/src/org/jboss/test/thirdparty/remoting.

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

Author: ron_sigal
Date: 2007-02-20 04:39:53 -0500 (Tue, 20 Feb 2007)
New Revision: 2368

Modified:
   trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
Log:
Protect against reusing a preexisting server.

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java	2007-02-20 09:39:51 UTC (rev 2367)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java	2007-02-20 09:39:53 UTC (rev 2368)
@@ -48,6 +48,7 @@
    // Attributes -----------------------------------------------------------------------------------
 
    private InvokerLocator serverLocator;
+   private boolean firstTime = true;
 
    // Constructors ---------------------------------------------------------------------------------
 
@@ -197,6 +198,14 @@
    {
       super.setUp();
 
+      // This test needs a special server, so make sure no other test left a server running.
+      if (firstTime)
+      {
+         firstTime = false;
+         ServerManagement.start(0, "remoting", null, true, false);
+         ServerManagement.stop();
+      }
+      
       // start a "standard" (messaging-enabled) remoting, we need to strip off the
       // marshaller/unmarshaller, though, since it can only bring trouble to this test ...
       ServiceAttributeOverrides sao = new ServiceAttributeOverrides();
@@ -209,6 +218,7 @@
          getAttribute(ServiceContainer.REMOTING_OBJECT_NAME, "InvokerLocator");
 
       serverLocator = new InvokerLocator(s);
+      log.info("InvokerLocator: " + serverLocator);
 
       log.debug("setup done");
    }