Author: robbie Date: Sat Feb 4 15:19:36 2012 New Revision: 1240517 URL: http://svn.apache.org/viewvc?rev=1240517&view=rev Log: QPID-3803: allow more time on persistent runs to help prevent sporadic failures on sorted queue tests
Applied patch from Oleksandr Rudyy <[email protected]> Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java?rev=1240517&r1=1240516&r2=1240517&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java Sat Feb 4 15:19:36 2012 @@ -143,7 +143,7 @@ public class SortedQueueTest extends Qpi { try { - consumerThread.join(5000L); + consumerThread.join(getConsumerThreadJoinInterval()); } catch(InterruptedException e) { @@ -156,6 +156,11 @@ public class SortedQueueTest extends Qpi producer.close(); } + private long getConsumerThreadJoinInterval() + { + return isBrokerStorePersistent() ? 50000L: 5000L; + } + public void testSortedQueueWithAscendingSortedKeys() throws JMSException, NamingException, AMQException { final Queue queue = createQueue(); @@ -177,7 +182,7 @@ public class SortedQueueTest extends Qpi { try { - consumerThread.join(5000L); + consumerThread.join(getConsumerThreadJoinInterval()); } catch(InterruptedException e) { @@ -212,7 +217,8 @@ public class SortedQueueTest extends Qpi TextMessage received = null; int messageCount = 0; - while((received = (TextMessage) consumer.receive(1000)) != null) + long receiveInterval = isBrokerStorePersistent() ? 3000l : 1000l; + while((received = (TextMessage) consumer.receive(receiveInterval)) != null) { assertEquals("Received message with unexpected sorted key value", "samesortkeyvalue", received.getStringProperty(TEST_SORT_KEY)); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
