Updated Branches: refs/heads/trunk 283cdd050 -> be8990e06
Removed @Ignore and updated timeout on testOrderOnActivateDeactivate, fixed by AMQ-4952 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/be8990e0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/be8990e0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/be8990e0 Branch: refs/heads/trunk Commit: be8990e06d53eebef8db7404e4cf4aa71df13590 Parents: 283cdd0 Author: Kevin Earls <[email protected]> Authored: Wed Jan 8 17:40:41 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Wed Jan 8 17:40:41 2014 +0100 ---------------------------------------------------------------------- .../apache/activemq/usecases/DurableSubscriptionOfflineTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/be8990e0/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java index 15c0627..a1ce526 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java @@ -386,8 +386,7 @@ public class DurableSubscriptionOfflineTest extends DurableSubscriptionOfflineTe } - @Ignore("see https://issues.apache.org/jira/browse/AMQ-4874") - @Test(timeout = 60 * 1000) + @Test(timeout = 2 * 60 * 1000) public void testOrderOnActivateDeactivate() throws Exception { for (int i=0;i<10;i++) { LOG.info("Iteration: " + i);
