You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/10/11 18:39:43 UTC
git commit: [HELIX-268] Atomic API (fix tests), rb=14578
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 <ka...@apache.org>
Authored: Fri Oct 11 09:39:17 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
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<ZNRecord> baseAccessor = new ZkBaseDataAccessor<ZNRecord>(_gZkClient);
final HelixDataAccessor helixAccessor =
new ZKHelixDataAccessor(clusterId.stringify(), baseAccessor);