Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6AD17108A8 for ; Wed, 8 Jan 2014 16:40:50 +0000 (UTC) Received: (qmail 8825 invoked by uid 500); 8 Jan 2014 16:40:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 8749 invoked by uid 500); 8 Jan 2014 16:40:49 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 8742 invoked by uid 99); 8 Jan 2014 16:40:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 16:40:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 631D754AD3; Wed, 8 Jan 2014 16:40:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kearls@apache.org To: commits@activemq.apache.org Message-Id: <84640e70bfd444889a0b56a742a5ea30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Removed @Ignore and updated timeout on testOrderOnActivateDeactivate, fixed by AMQ-4952 Date: Wed, 8 Jan 2014 16:40:49 +0000 (UTC) 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 Authored: Wed Jan 8 17:40:41 2014 +0100 Committer: Kevin Earls 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);