activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1424461 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Date Thu, 20 Dec 2012 13:44:10 GMT
Author: gtully
Date: Thu Dec 20 13:44:10 2012
New Revision: 1424461

URL: http://svn.apache.org/viewvc?rev=1424461&view=rev
Log:
prevent test from hanging build, add knowlege of health bean

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java?rev=1424461&r1=1424460&r2=1424461&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryNetworkReconnectTest.java
Thu Dec 20 13:44:10 2012
@@ -109,6 +109,8 @@ public class DiscoveryNetworkReconnectTe
             allowing (managementContext).registerMBean(with(any(Object.class)), with(equal(
                     new ObjectName("Test:BrokerName=BrokerNC,Type=Broker"))));
             allowing (managementContext).registerMBean(with(any(Object.class)), with(equal(
+                    new ObjectName("Test:BrokerName=BrokerNC,Type=Health"))));
+            allowing (managementContext).registerMBean(with(any(Object.class)), with(equal(
                     new ObjectName("Test:BrokerName=BrokerNC,Type=NetworkConnector,NetworkConnectorName=NC"))));
             allowing (managementContext).registerMBean(with(any(Object.class)), with(equal(
           
                     new ObjectName("Test:BrokerName=BrokerNC,Type=Topic,Destination=ActiveMQ.Advisory.Connection"))));
@@ -139,6 +141,8 @@ public class DiscoveryNetworkReconnectTe
             allowing (managementContext).unregisterMBean(with(equal(
                     new ObjectName("Test:BrokerName=BrokerNC,Type=Broker"))));
             allowing (managementContext).unregisterMBean(with(equal(
+                    new ObjectName("Test:BrokerName=BrokerNC,Type=Health"))));
+            allowing (managementContext).unregisterMBean(with(equal(
                     new ObjectName("Test:BrokerName=BrokerNC,Type=NetworkConnector,NetworkConnectorName=NC"))));
             allowing (managementContext).unregisterMBean(with(equal(            
                     new ObjectName("Test:BrokerName=BrokerNC,Type=Topic,Destination=ActiveMQ.Advisory.Connection"))));
@@ -202,13 +206,13 @@ public class DiscoveryNetworkReconnectTe
             }));
             
             // wait for network connector
-            assertTrue("network connector mbean registered within 3 minute", mbeanRegistered.tryAcquire(180,
TimeUnit.SECONDS));
+            assertTrue("network connector mbean registered within 1 minute", mbeanRegistered.tryAcquire(60,
TimeUnit.SECONDS));
             
             // force an inactivity timeout via the proxy
             proxy.pause();
         
             // wait for the inactivity timeout and network shutdown
-            assertTrue("network connector mbean unregistered within 3 minute", mbeanUnregistered.tryAcquire(180,
TimeUnit.SECONDS));
+            assertTrue("network connector mbean unregistered within 1 minute", mbeanUnregistered.tryAcquire(60,
TimeUnit.SECONDS));
             
             // whack all connections
             proxy.close();



Mime
View raw message