Return-Path: X-Original-To: apmail-helix-commits-archive@minotaur.apache.org Delivered-To: apmail-helix-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 743BE10544 for ; Fri, 11 Oct 2013 16:40:12 +0000 (UTC) Received: (qmail 66027 invoked by uid 500); 11 Oct 2013 16:40:11 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 65991 invoked by uid 500); 11 Oct 2013 16:40:10 -0000 Mailing-List: contact commits-help@helix.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.incubator.apache.org Delivered-To: mailing list commits@helix.incubator.apache.org Received: (qmail 65977 invoked by uid 99); 11 Oct 2013 16:40:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 16:40:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 11 Oct 2013 16:40:06 +0000 Received: (qmail 62029 invoked by uid 99); 11 Oct 2013 16:39:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 16:39:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 654D5915809; Fri, 11 Oct 2013 16:39:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kanak@apache.org To: commits@helix.incubator.apache.org Message-Id: <2cecca9eaa7a4245a1917f608bc91f3c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [HELIX-268] Atomic API (fix tests), rb=14578 Date: Fri, 11 Oct 2013 16:39:43 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/helix-logical-model 47ed66fac -> 0a2edeef2 [HELIX-268] Atomic API (fix tests), rb=14578 Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/0a2edeef Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/0a2edeef Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/0a2edeef Branch: refs/heads/helix-logical-model Commit: 0a2edeef29a25b6a3aa3bf65bf1f5df9bc2e9b5f Parents: 47ed66f Author: Kanak Biscuitwala Authored: Fri Oct 11 09:39:17 2013 -0700 Committer: Kanak Biscuitwala Committed: Fri Oct 11 09:39:17 2013 -0700 ---------------------------------------------------------------------- .../java/org/apache/helix/api/accessor/TestAccessorRecreate.java | 2 +- .../java/org/apache/helix/api/accessor/TestAtomicAccessors.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0a2edeef/helix-core/src/test/java/org/apache/helix/api/accessor/TestAccessorRecreate.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/api/accessor/TestAccessorRecreate.java b/helix-core/src/test/java/org/apache/helix/api/accessor/TestAccessorRecreate.java index e034779..4eebbc6 100644 --- a/helix-core/src/test/java/org/apache/helix/api/accessor/TestAccessorRecreate.java +++ b/helix-core/src/test/java/org/apache/helix/api/accessor/TestAccessorRecreate.java @@ -50,7 +50,7 @@ public class TestAccessorRecreate extends ZkUnitTestBase { @Test public void testRecreateCluster() { final String MODIFIER = "modifier"; - final ClusterId clusterId = ClusterId.from("testCluster"); + final ClusterId clusterId = ClusterId.from("TestAccessorRecreate!testCluster"); // connect boolean connected = _gZkClient.waitUntilConnected(30000, TimeUnit.MILLISECONDS); http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/0a2edeef/helix-core/src/test/java/org/apache/helix/api/accessor/TestAtomicAccessors.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/api/accessor/TestAtomicAccessors.java b/helix-core/src/test/java/org/apache/helix/api/accessor/TestAtomicAccessors.java index 88907f0..443c3db 100644 --- a/helix-core/src/test/java/org/apache/helix/api/accessor/TestAtomicAccessors.java +++ b/helix-core/src/test/java/org/apache/helix/api/accessor/TestAtomicAccessors.java @@ -49,7 +49,7 @@ public class TestAtomicAccessors extends ZkUnitTestBase { @Test public void testClusterUpdates() { - final ClusterId clusterId = ClusterId.from("testCluster"); + final ClusterId clusterId = ClusterId.from("TestAtomicAccessors!testCluster"); final BaseDataAccessor baseAccessor = new ZkBaseDataAccessor(_gZkClient); final HelixDataAccessor helixAccessor = new ZKHelixDataAccessor(clusterId.stringify(), baseAccessor);