Author: kwall
Date: Tue Apr 19 08:05:52 2016
New Revision: 1739860
URL: http://svn.apache.org/viewvc?rev=1739860&view=rev
Log:
NO-JIRA: [Java Tests] Increase wiggle room in queue unit tests to help prevent
sporadic test failures
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1739860&r1=1739859&r2=1739860&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
Tue Apr 19 08:05:52 2016
@@ -71,7 +71,12 @@ import org.apache.qpid.test.utils.QpidTe
abstract class AbstractQueueTestBase extends QpidTestCase
{
private static final Logger _logger =
LoggerFactory.getLogger(AbstractQueueTestBase.class);
+ private static final long QUEUE_RUNNER_WAIT_TIME =
Long.getLong("AbstractQueueTestBase.queueRunnerWaitTime", 150L);
+ static
+ {
+ _logger.debug("Using AbstractQueueTestBase.queueRunnerWaitTime {}",
QUEUE_RUNNER_WAIT_TIME);
+ }
private Queue<?> _queue;
private VirtualHost<?> _virtualHost;
@@ -181,13 +186,8 @@ abstract class AbstractQueueTestBase ext
// Check sending a message ends up with the subscriber
_queue.enqueue(messageA, null, null);
- try
- {
- Thread.sleep(2000L);
- }
- catch(InterruptedException e)
- {
- }
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME);
+
assertEquals(messageA,
_consumer.getQueueContext().getLastSeenEntry().getMessage());
assertNull(_consumer.getQueueContext().getReleasedEntry());
@@ -211,7 +211,7 @@ abstract class AbstractQueueTestBase ext
_consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget,
null, messageA.getClass(), "test",
EnumSet.of(ConsumerImpl.Option.ACQUIRES,
ConsumerImpl.Option.SEES_REQUEUES));
- Thread.sleep(150);
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME);
assertEquals(messageA,
_consumer.getQueueContext().getLastSeenEntry().getMessage());
assertNull("There should be no releasedEntry after an enqueue",
_consumer.getQueueContext().getReleasedEntry());
@@ -229,7 +229,7 @@ abstract class AbstractQueueTestBase ext
_consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget,
null, messageA.getClass(), "test",
EnumSet.of(ConsumerImpl.Option.ACQUIRES,
ConsumerImpl.Option.SEES_REQUEUES));
- Thread.sleep(150);
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME);
assertEquals(messageB,
_consumer.getQueueContext().getLastSeenEntry().getMessage());
assertNull("There should be no releasedEntry after enqueues",
_consumer.getQueueContext().getReleasedEntry());
@@ -260,7 +260,7 @@ abstract class AbstractQueueTestBase ext
_queue.enqueue(messageB, postEnqueueAction, null);
_queue.enqueue(messageC, postEnqueueAction, null);
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to consumer",
3,
@@ -273,7 +273,7 @@ abstract class AbstractQueueTestBase ext
queueEntries.get(0).release();
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to consumer",
4,
@@ -319,8 +319,7 @@ abstract class AbstractQueueTestBase ext
/* Enqueue one message with expiration set for a short time in the
future */
- int messageExpirationOffset = 200;
- final long expiration = System.currentTimeMillis() +
messageExpirationOffset;
+ final long expiration = System.currentTimeMillis() +
QUEUE_RUNNER_WAIT_TIME;
when(messageA.getExpiration()).thenReturn(expiration);
_queue.enqueue(messageA, postEnqueueAction, null);
@@ -395,7 +394,7 @@ abstract class AbstractQueueTestBase ext
_queue.enqueue(messageB, postEnqueueAction, null);
_queue.enqueue(messageC, postEnqueueAction, null);
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to consumer",
3,
@@ -409,7 +408,7 @@ abstract class AbstractQueueTestBase ext
queueEntries.get(2).release();
queueEntries.get(0).release();
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to consumer",
5,
@@ -452,7 +451,7 @@ abstract class AbstractQueueTestBase ext
_queue.enqueue(messageA, postEnqueueAction, null);
_queue.enqueue(messageB, postEnqueueAction, null);
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to both after
enqueue",
2,
@@ -461,7 +460,7 @@ abstract class AbstractQueueTestBase ext
/* Now release the first message only, causing it to be requeued */
queueEntries.get(0).release();
- Thread.sleep(150); // Work done by QueueRunner Thread
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner
Thread
assertEquals("Unexpected total number of messages sent to both
consumers after release",
3,
@@ -488,13 +487,8 @@ abstract class AbstractQueueTestBase ext
// Check sending a message ends up with the subscriber
_queue.enqueue(messageA, null, null);
- try
- {
- Thread.sleep(2000L);
- }
- catch (InterruptedException e)
- {
- }
+ Thread.sleep(QUEUE_RUNNER_WAIT_TIME);
+
assertEquals(messageA,
_consumer.getQueueContext().getLastSeenEntry().getMessage());
// Check we cannot add a second subscriber to the queue
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=1739860&r1=1739859&r2=1739860&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
(original)
+++ qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties Tue Apr
19 08:05:52 2016
@@ -19,4 +19,6 @@
#
#
-qpid.port.protocol_handshake_timeout=10000
\ No newline at end of file
+qpid.port.protocol_handshake_timeout=10000
+
+AbstractQueueTestBase.queueRunnerWaitTime=500
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
