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 0B85118A54 for ; Wed, 17 Jun 2015 13:42:00 +0000 (UTC) Received: (qmail 90404 invoked by uid 500); 17 Jun 2015 13:42:00 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 90298 invoked by uid 500); 17 Jun 2015 13:41:59 -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 90195 invoked by uid 99); 17 Jun 2015 13:41:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 13:41:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3667E0007; Wed, 17 Jun 2015 13:41:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Date: Wed, 17 Jun 2015 13:42:01 -0000 Message-Id: <5b3edbb8df964cf8846b05a493b40439@git.apache.org> In-Reply-To: <4f30a2fff707460884f26c560b81519f@git.apache.org> References: <4f30a2fff707460884f26c560b81519f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] activemq git commit: disable periodic expiry b/c that will page in and effect the usage assertions if the test lasts for more than 30s. read ci disable periodic expiry b/c that will page in and effect the usage assertions if the test lasts for more than 30s. read ci Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d5c25c02 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d5c25c02 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d5c25c02 Branch: refs/heads/master Commit: d5c25c027b42000520ffa68a64fde75b1d4a1bf7 Parents: 38f7857 Author: gtully Authored: Wed Jun 17 14:29:28 2015 +0100 Committer: gtully Committed: Wed Jun 17 14:33:32 2015 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/activemq/usecases/MemoryLimitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/d5c25c02/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java index 3e3dcff..d2b1be8 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java @@ -66,8 +66,8 @@ public class MemoryLimitTest extends TestSupport { PolicyMap policyMap = new PolicyMap(); PolicyEntry policyEntry = new PolicyEntry(); + policyEntry.setExpireMessagesPeriod(0); // when this fires it will consume 2*pageSize mem which will throw the test policyEntry.setProducerFlowControl(false); - policyEntry.setExpireMessagesPeriod(0); policyMap.put(new ActiveMQQueue(">"), policyEntry); broker.setDestinationPolicy(policyMap);