You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/30 10:28:31 UTC

svn commit: r1789489 - in /qpid/java/trunk: perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java test-profiles/apache-ci.test.overridden.properties

Author: kwall
Date: Thu Mar 30 10:28:31 2017
New Revision: 1789489

URL: http://svn.apache.org/viewvc?rev=1789489&view=rev
Log:
NO-JIRA: [Perf Tests] Make test timeout configurable to allow for more wiggle room on slower Apache CI boxes

Modified:
    qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
    qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties

Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java?rev=1789489&r1=1789488&r2=1789489&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/controller/ClientRegistryTest.java Thu Mar 30 10:28:31 2017
@@ -30,10 +30,18 @@ public class ClientRegistryTest extends
     private static final String CLIENT2_REGISTERED_NAME = "CLIENT2_REGISTERED_NAME";
     private static final String CLIENT3_REGISTERED_NAME = "CLIENT3_REGISTERED_NAME";
 
-    private static final int AWAIT_DELAY = 100;
+    private long _awaitDelay = 100;
 
     private ClientRegistry _clientRegistry = new ClientRegistry();
 
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        _awaitDelay = Long.getLong("ClientRegistryTest.awaitDelay", 100L);
+
+    }
+
     public void testRegisterClient()
     {
         assertEquals(0, _clientRegistry.getClients().size());
@@ -59,7 +67,7 @@ public class ClientRegistryTest extends
 
     public void testAwaitOneClientWhenClientNotRegistered()
     {
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, AWAIT_DELAY);
+        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, _awaitDelay);
         assertEquals(1, numberOfClientsAbsent);
     }
 
@@ -67,7 +75,7 @@ public class ClientRegistryTest extends
     {
         _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
 
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, AWAIT_DELAY);
+        int numberOfClientsAbsent = _clientRegistry.awaitClients(1, _awaitDelay);
         assertEquals(0, numberOfClientsAbsent);
     }
 
@@ -76,7 +84,7 @@ public class ClientRegistryTest extends
         _clientRegistry.registerClient(CLIENT1_REGISTERED_NAME);
         registerClientLater(CLIENT2_REGISTERED_NAME, 50);
 
-        int numberOfClientsAbsent = _clientRegistry.awaitClients(2, AWAIT_DELAY);
+        int numberOfClientsAbsent = _clientRegistry.awaitClients(2, _awaitDelay);
         assertEquals(0, numberOfClientsAbsent);
     }
 

Modified: qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties?rev=1789489&r1=1789488&r2=1789489&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties (original)
+++ qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties Thu Mar 30 10:28:31 2017
@@ -38,6 +38,7 @@ BDBHAVirtualHostNodeTestHelper.numberOfS
 BDBHAVirtualHostNodeTestHelper.sleepIntervalOnChangeWaiting=100
 BDBHAVirtualHostNodeTestHelper.waitForVirtualhostInterval=30000
 MultiNodeTest.testInFlightTransactionsWhilstMajorityIsLost.numberOfConnections=3
+ClientRegistryTest.awaitDelay=500
 
 qpid.test_receive_short_timeout=1000
 qpid.test_receive_timeout=2000



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org