You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/05/08 12:23:52 UTC
[2/2] curator git commit: Merge branch 'master' into CURATOR-411
Merge branch 'master' into CURATOR-411
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5407746c
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5407746c
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5407746c
Branch: refs/heads/CURATOR-411
Commit: 5407746c37c6ee08bbefe6632e25f5790226180c
Parents: 872bfb0 32a7755
Author: randgalt <ra...@apache.org>
Authored: Mon May 8 06:15:40 2017 +0200
Committer: randgalt <ra...@apache.org>
Committed: Mon May 8 06:15:40 2017 +0200
----------------------------------------------------------------------
.../curator/framework/imps/TestFrameworkEdges.java | 14 +++++++++++---
.../apache/curator/test/TestingQuorumPeerMain.java | 3 +--
.../apache/curator/test/TestingZooKeeperMain.java | 7 -------
.../apache/curator/test/TestingZooKeeperServer.java | 15 +++++++++++----
.../org/apache/curator/test/ZooKeeperMainFace.java | 3 ---
5 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/5407746c/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
----------------------------------------------------------------------
diff --cc curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
index ce0bb26,6acbaf6..887f236
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
@@@ -178,10 -178,17 +178,15 @@@ public class TestFrameworkEdges extend
}
};
final String TEST_PATH = "/a/b/c/test-";
- client.create().withMode(mode).inBackground(callback).forPath(TEST_PATH);
+ long ttl = timing.forWaiting().milliseconds()*1000;
+ CreateBuilder firstCreateBuilder = client.create();
+ if(mode.isTTL()) {
+ firstCreateBuilder.withTtl(ttl);
+ }
+ firstCreateBuilder.withMode(mode).inBackground(callback).forPath(TEST_PATH);
- String name1 = paths.poll(timing.forWaiting().milliseconds(), TimeUnit.MILLISECONDS);
- String path1 = paths.poll(timing.forWaiting().milliseconds(), TimeUnit.MILLISECONDS);
- Assert.assertNotNull(name1);
- Assert.assertNotNull(path1);
+ String name1 = timing.takeFromQueue(paths);
+ String path1 = timing.takeFromQueue(paths);
client.close();