Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C3CA19E2B for ; Fri, 8 Apr 2016 16:26:23 +0000 (UTC) Received: (qmail 8402 invoked by uid 500); 8 Apr 2016 16:26:23 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 8331 invoked by uid 500); 8 Apr 2016 16:26:23 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 8159 invoked by uid 99); 8 Apr 2016 16:26:23 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2016 16:26:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9E2D9C1B01 for ; Fri, 8 Apr 2016 16:26:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.996] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 0Zieef4okVW2 for ; Fri, 8 Apr 2016 16:26:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 0B82D5FADE for ; Fri, 8 Apr 2016 16:26:20 +0000 (UTC) Received: (qmail 7533 invoked by uid 99); 8 Apr 2016 16:26:20 -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; Fri, 08 Apr 2016 16:26:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D489BEAB41; Fri, 8 Apr 2016 16:26:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jinmeiliao@apache.org To: commits@geode.incubator.apache.org Date: Fri, 08 Apr 2016 16:26:36 -0000 Message-Id: In-Reply-To: <00dfed5274f145988a6426afa50cefc6@git.apache.org> References: <00dfed5274f145988a6426afa50cefc6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/36] incubator-geode git commit: GEODE-1171: Preventing accidental cron triggering in AutoBalancerJUnitTest GEODE-1171: Preventing accidental cron triggering in AutoBalancerJUnitTest This test creates an Autobalancer with a cron schedule. Upping the the default scheduler to trigger after 30 minutes, to avoid accidentally trigging the cron job. Some tests do appear to exercise the scheduler, so changing this to an integration test because it starts threads. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/566dc0b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/566dc0b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/566dc0b1 Branch: refs/heads/feature/GEODE-17-2 Commit: 566dc0b1c3756f958ea89af897b0b8da5872dea3 Parents: 36f3f8d Author: Dan Smith Authored: Tue Apr 5 10:42:18 2016 -0700 Committer: Dan Smith Committed: Tue Apr 5 17:13:07 2016 -0700 ---------------------------------------------------------------------- .../com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/566dc0b1/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java index cb88022..4acd0b3 100644 --- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java +++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerJUnitTest.java @@ -58,12 +58,12 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.control.InternalResourceManager; import com.gemstone.gemfire.internal.cache.partitioned.InternalPRInfo; import com.gemstone.gemfire.internal.cache.partitioned.LoadProbe; -import com.gemstone.gemfire.test.junit.categories.UnitTest; +import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** * UnitTests for AutoBalancer. All collaborators should be mocked. */ -@Category(UnitTest.class) +@Category(IntegrationTest.class) public class AutoBalancerJUnitTest { Mockery mockContext; @@ -598,7 +598,7 @@ public class AutoBalancerJUnitTest { static Properties getBasicConfig() { Properties props = new Properties(); // every second schedule - props.put(AutoBalancer.SCHEDULE, "* * * * * ?"); + props.put(AutoBalancer.SCHEDULE, "* 0/30 * * * ?"); return props; } }