You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2016/05/25 11:34:23 UTC

activemq git commit: tidy up close for vm broker - seems ci failure of InMemeoryJmsSchedulerTest is related to overlap between tests of vm transport

Repository: activemq
Updated Branches:
  refs/heads/master fe9d99e7a -> 281fbb1f9


tidy up close for vm broker - seems ci failure of InMemeoryJmsSchedulerTest is related to overlap between tests of vm transport


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/281fbb1f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/281fbb1f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/281fbb1f

Branch: refs/heads/master
Commit: 281fbb1f9d7e329fd36556df6c0ea23a8bbea683
Parents: fe9d99e
Author: gtully <ga...@gmail.com>
Authored: Wed May 25 12:34:07 2016 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 25 12:34:07 2016 +0100

----------------------------------------------------------------------
 .../org/apache/activemq/broker/scheduler/JmsSchedulerTest.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/281fbb1f/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
index d0c1ccc..fec03c5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/JmsSchedulerTest.java
@@ -84,6 +84,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         assertEquals(1, list.size());
         latch.await(240, TimeUnit.SECONDS);
         assertEquals(COUNT, count.get());
+        connection.close();
     }
 
     @Test
@@ -117,6 +118,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         assertEquals(latch.getCount(), COUNT);
         latch.await(5, TimeUnit.SECONDS);
         assertEquals(latch.getCount(), 0);
+        connection.close();
     }
 
     @Test
@@ -156,6 +158,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         assertEquals(latch.getCount(), COUNT);
         latch.await(5, TimeUnit.SECONDS);
         assertEquals(latch.getCount(), 0);
+        connection.close();
     }
 
     @Test
@@ -193,6 +196,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         // wait a little longer - make sure we only get NUMBER of replays
         Thread.sleep(1000);
         assertEquals(NUMBER, count.get());
+        connection.close();
     }
 
     @Test
@@ -230,6 +234,7 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, time);
         producer.send(message);
         producer.close();
+        connection.close();
     }
 
     @Test
@@ -290,5 +295,6 @@ public class JmsSchedulerTest extends JobSchedulerTestSupport {
         latch.await(20000l, TimeUnit.MILLISECONDS);
 
         assertEquals("Consumer did not receive all messages.", 0, latch.getCount());
+        conn.close();
     }
 }