[jboss-cvs] JBoss Messaging SVN: r6085 - trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover.

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

Author: clebert.suconic at jboss.com
Date: 2009-03-14 12:12:18 -0400 (Sat, 14 Mar 2009)
New Revision: 6085

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
Log:
Changing timeout for LargeMessages

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java	2009-03-13 16:49:29 UTC (rev 6084)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java	2009-03-14 16:12:18 UTC (rev 6085)
@@ -63,6 +63,13 @@
 
    // Protected -----------------------------------------------------
 
+   protected int getLatchWait()
+   {
+      return 60000;
+   }
+
+
+   
    protected ClientSessionFactoryInternal createSessionFactory()
    {
       ClientSessionFactoryInternal sf = super.createSessionFactory();

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java	2009-03-13 16:49:29 UTC (rev 6084)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java	2009-03-14 16:12:18 UTC (rev 6085)
@@ -70,6 +70,8 @@
    // Constants -----------------------------------------------------
 
    private static final int RECEIVE_TIMEOUT = 30000;
+   
+   private final int LATCH_WAIT = getLatchWait();
 
    private static final int NUM_THREADS = 10;
 
@@ -301,7 +303,7 @@
 
       consumer.setMessageHandler(handler);
 
-      boolean ok = handler.latch.await(20000, TimeUnit.MILLISECONDS);
+      boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
       if (!ok)
       {
@@ -376,7 +378,7 @@
 
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(20000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          if (!ok)
          {
@@ -464,7 +466,7 @@
 
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          if (!ok)
          {
@@ -556,7 +558,7 @@
 
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          if (!ok)
          {
@@ -580,7 +582,7 @@
       
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          assertTrue(ok);
       }
@@ -668,7 +670,7 @@
 
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          if (!ok)
          {
@@ -708,7 +710,7 @@
 
       for (MyHandler handler : handlers)
       {
-         boolean ok = handler.latch.await(50000, TimeUnit.MILLISECONDS);
+         boolean ok = handler.latch.await(LATCH_WAIT, TimeUnit.MILLISECONDS);
 
          if (!ok)
          {
@@ -1290,6 +1292,11 @@
 
       sessCreate.close();
    }
+   
+   protected int getLatchWait()
+   {
+      return 20000;
+   }
 
    protected int getNumIterations()
    {