[jboss-cvs] JBoss Messaging SVN: r8322 - in branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms: bridge and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 8 01:42:22 EDT 2011
Author: gaohoward
Date: 2011-06-08 01:42:20 -0400 (Wed, 08 Jun 2011)
New Revision: 8322
Modified:
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MessageSuckerTest.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
Log:
JBMESSAGING-1874
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -106,7 +106,7 @@
conn.start();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage tm = (TextMessage)cons.receive(15000);
+ TextMessage tm = (TextMessage)cons.receive(30000);
assertNotNull(tm);
assertEquals(MESSAGE_TEXT, tm.getText());
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -806,7 +806,7 @@
for (int i = 1; i < NUM_MSG; i++)
{
- TextMessage rm = (TextMessage)consmr.receive(500);
+ TextMessage rm = (TextMessage)consmr.receive(5000);
assertNotNull(rm);
// each message should have the header.
String orderingGroupName = rm.getStringProperty(JBossMessage.JBOSS_MESSAGING_ORDERING_GROUP_ID);
@@ -826,7 +826,7 @@
for (int i = 1; i < NUM_MSG; i++)
{
- TextMessage rm = (TextMessage)consmr.receive(500);
+ TextMessage rm = (TextMessage)consmr.receive(5000);
assertNotNull(rm);
// each message should have the header.
String orderingGroupName = rm.getStringProperty(JBossMessage.JBOSS_MESSAGING_ORDERING_GROUP_ID);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -257,7 +257,7 @@
//waiting for recovery to kick in
while (true)
{
- TextMessage tm = (TextMessage)cons.receive(count == 0 ? (longWaitForFirst ? 60000 : 10000) : 5000);
+ TextMessage tm = (TextMessage)cons.receive(count == 0 ? (longWaitForFirst ? 300000 : 50000) : 10000);
if (tm == null)
{
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -182,7 +182,7 @@
ServerManagement.stop(failoverNodeId);
}
- Thread.sleep(8000);
+ Thread.sleep(20000);
int newFailoverNodeId = this.getFailoverNodeForNode(cf, 1);
@@ -633,7 +633,7 @@
while (true)
{
- FailoverEvent event = failoverListener.getEvent(30000);
+ FailoverEvent event = failoverListener.getEvent(120000);
if (event != null
&& FailoverEvent.FAILOVER_COMPLETED == event.getType())
{
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -81,7 +81,7 @@
// the sleep time has to be longer than the sum of validatorPingPeriod and validatorPingTimeout.
// see remoting-bisocket-service.xml
- long sleepTime = TestUtil.getProperSleepTime("clusterViewUpdateTest.testUpdateTopology", 20000);
+ long sleepTime = TestUtil.getProperSleepTime("clusterViewUpdateTest.testUpdateTopology", 40000);
log.info("Sleeping for " + sleepTime);
Thread.sleep(sleepTime);
@@ -234,7 +234,7 @@
ServerManagement.log(ServerManagement.INFO, "Killing server1", 2);
ServerManagement.kill(1);
// Need some time for Lease
- Thread.sleep(11000);
+ Thread.sleep(22000);
assertEquals("Delegates are different on topology", 2,clusterDelegate.getTopology().getDelegates().length);
assertEquals(2, clusterDelegate.getDelegates().length);
@@ -242,7 +242,7 @@
ServerManagement.log(ServerManagement.INFO, "Stopping server0", 2);
ServerManagement.stop(0);
- Thread.sleep(1000);
+ Thread.sleep(5000);
assertEquals(1, clusterDelegate.getDelegates().length);
@@ -316,8 +316,8 @@
ServerManagement.kill(1);
- log.info("sleeping 20 secs ...");
- Thread.sleep(20000);
+ log.info("sleeping 40 secs ...");
+ Thread.sleep(40000);
// first part of the test, verifies if the CF was updated
assertEquals(1, cfDelegate.getDelegates().length);
@@ -361,8 +361,8 @@
ServerManagement.kill(1);
- log.info("sleeping 20 secs ...");
- Thread.sleep(20000);
+ log.info("sleeping 40 secs ...");
+ Thread.sleep(40000);
// first part of the test, verifies if the CF was updated
assertEquals(1, cfDelegate.getDelegates().length);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -240,7 +240,7 @@
long end = System.currentTimeMillis();
//Make sure it doesn't take too long
- assertTrue((end - start) <= 100);
+ assertTrue((end - start) <= 500);
}
}
finally
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -608,7 +608,7 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(10000);
assertNotNull(tm);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -1426,7 +1426,7 @@
// we must receive the message
- TextMessage tm = (TextMessage)c1.receive(3000);
+ TextMessage tm = (TextMessage)c1.receive(30000);
assertEquals("blip", tm.getText());
}
@@ -2318,7 +2318,7 @@
// we must receive the message
- TextMessage tm = (TextMessage)c1.receive(3000);
+ TextMessage tm = (TextMessage)c1.receive(30000);
assertNotNull(tm);
assertEquals("blip", tm.getText());
@@ -2365,7 +2365,7 @@
producer.send(session.createTextMessage("before-poison"));
- TextMessage tm = (TextMessage)consumer.receive(5000);
+ TextMessage tm = (TextMessage)consumer.receive(10000);
if(typeOfFailure == PoisonInterceptor.FAIL_AFTER_ACKNOWLEDGE_DELIVERY)
{
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -69,7 +69,7 @@
log.info("Blocking to receive notification ...");
- if (!listener.viewChanged(30000))
+ if (!listener.viewChanged(60000))
{
fail("Did not receive view change!");
}
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -350,7 +350,7 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons.receive(1000);
+ TextMessage tm = (TextMessage)cons.receive(10000);
assertNotNull(tm);
@@ -413,7 +413,7 @@
for (int i = 0; i < NUM_MESSAGES / 2; i++)
{
- TextMessage tm = (TextMessage)cons.receive(1000);
+ TextMessage tm = (TextMessage)cons.receive(10000);
assertNotNull(tm);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -119,7 +119,7 @@
Set ids = new HashSet();
for (int i = 5; i < 20; i++)
{
- msg = (TextMessage)consumer0.receive(5000);
+ msg = (TextMessage)consumer0.receive(10000);
assertNotNull(msg);
log.info("msg = " + msg.getText());
ids.add(msg.getText());
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MessageSuckerTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MessageSuckerTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MessageSuckerTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -176,6 +176,7 @@
{
conn2.close();
}
+ Thread.sleep(12000);
}
}
@@ -279,7 +280,7 @@
producer2.send(messages[i]);
}
- Thread.sleep(2000);
+ Thread.sleep(30000);
// should be sucked.
result = clusterConnMgr.checkMessageNotSucked(0);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2011-06-08 04:51:33 UTC (rev 8321)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2011-06-08 05:42:20 UTC (rev 8322)
@@ -85,9 +85,9 @@
queueProducer.send(m, DeliveryMode.NON_PERSISTENT, 4, 5000);
//Delivery is asynch - need to give enough time to get to the consumer
- Thread.sleep(2000);
+ Thread.sleep(4000);
- Message result = queueConsumer.receive(10);
+ Message result = queueConsumer.receive(1000);
assertEquals(m.getJMSMessageID(), result.getJMSMessageID());
}
More information about the jboss-cvs-commits
mailing list