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 2018/12/07 04:24:56 UTC
[1/3] curator git commit: CURATOR-490 - doc change to how the
compatibility classes are copied
Repository: curator
Updated Branches:
refs/heads/CURATOR-490 8c4095086 -> 9f12a189c
CURATOR-490 - doc change to how the compatibility classes are copied
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/1584e456
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/1584e456
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/1584e456
Branch: refs/heads/CURATOR-490
Commit: 1584e4561524c0a72cbf824b2a09a63f002642be
Parents: 8c40950
Author: randgalt <ra...@apache.org>
Authored: Thu Dec 6 23:23:47 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Dec 6 23:23:47 2018 -0500
----------------------------------------------------------------------
curator-test-zk34/README.md | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/1584e456/curator-test-zk34/README.md
----------------------------------------------------------------------
diff --git a/curator-test-zk34/README.md b/curator-test-zk34/README.md
index 3615c0b..278322b 100644
--- a/curator-test-zk34/README.md
+++ b/curator-test-zk34/README.md
@@ -9,3 +9,8 @@ Apache Curator 4.0 adds best-effort backward compatibility for ZooKeeper 3.4 ens
- A new test base class `CuratorTestBase` is started. Over time more common stuff should go in here but, for now, this defines a TestNG listener, Zk35MethodInterceptor, that allows for tests that are ZooKeeper 3.5 only to be marked by `@Test(groups = Zk35MethodInterceptor.zk35Group)`. These tests will not be run during the 3.4 compatibility check.
- curator-test-zk34 needs some of the new classes from curator-test. Rather than have copies of the classes the maven-resources-plugin is used to copy from curator-test to the generated sources dir of curator-test-zk34. All classes in `curator-test/src/main/java/org/apache/curator/test/compatibility` are copied.
+## Important Note For Building This Module
+
+This module contains a copy of classes from the `curator-test` module in the package `org.apache.curator.test.compatibility`.
+If a change is made to any of the classes in this package, you must run (from the root of Curator) `copyfiles.sh` which
+re-copies those files into the `curator-test-zk34` module and then commit to git.
[3/3] curator git commit: CURATOR-490 block until connected to avoid
CONNECTION_RECONNECTED events
Posted by ra...@apache.org.
CURATOR-490 block until connected to avoid CONNECTION_RECONNECTED events
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9f12a189
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9f12a189
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9f12a189
Branch: refs/heads/CURATOR-490
Commit: 9f12a189ccc00b59cf8908524c729b1fba237ded
Parents: eaebdd9
Author: randgalt <ra...@apache.org>
Authored: Thu Dec 6 23:24:51 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Dec 6 23:24:51 2018 -0500
----------------------------------------------------------------------
.../framework/recipes/cache/TestPathChildrenCache.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/9f12a189/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
----------------------------------------------------------------------
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
index d2f8cc0..ec1d4a1 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java
@@ -56,6 +56,7 @@ public class TestPathChildrenCache extends BaseClassForTests
try
{
client.start();
+ client.blockUntilConnected(); // avoid PathChildrenCache connected events
final BlockingQueue<PathChildrenCacheEvent.Type> events = Queues.newLinkedBlockingQueue();
PathChildrenCacheListener listener = new PathChildrenCacheListener()
@@ -68,7 +69,6 @@ public class TestPathChildrenCache extends BaseClassForTests
};
cache.getListenable().addListener(listener);
cache.start(PathChildrenCache.StartMode.POST_INITIALIZED_EVENT);
- Assert.assertEquals(events.poll(timing.forWaiting().milliseconds(), TimeUnit.MILLISECONDS), PathChildrenCacheEvent.Type.CONNECTION_RECONNECTED);
Assert.assertEquals(events.poll(timing.forWaiting().milliseconds(), TimeUnit.MILLISECONDS), PathChildrenCacheEvent.Type.INITIALIZED);
client.create().forPath("/a/b/test/one");
@@ -190,11 +190,11 @@ public class TestPathChildrenCache extends BaseClassForTests
cache.getListenable().addListener(listener);
cache.start();
Assert.assertTrue(timing.awaitLatch(ensurePathLatch));
-
+
final CountDownLatch connectedLatch = new CountDownLatch(1);
client.getConnectionStateListenable().addListener(new ConnectionStateListener()
{
-
+
@Override
public void stateChanged(CuratorFramework client, ConnectionState newState)
{
@@ -206,7 +206,7 @@ public class TestPathChildrenCache extends BaseClassForTests
});
server = new TestingServer(serverPort, true);
-
+
Assert.assertTrue(timing.awaitLatch(connectedLatch));
client.create().creatingParentContainersIfNeeded().forPath("/baz", new byte[]{1, 2, 3});
[2/3] curator git commit: CURATOR-490 set SKIP status on retries
Posted by ra...@apache.org.
CURATOR-490 set SKIP status on retries
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/eaebdd95
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/eaebdd95
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/eaebdd95
Branch: refs/heads/CURATOR-490
Commit: eaebdd95c2d50a933eb443d9e84da5db389da18f
Parents: 1584e45
Author: randgalt <ra...@apache.org>
Authored: Thu Dec 6 23:24:22 2018 -0500
Committer: randgalt <ra...@apache.org>
Committed: Thu Dec 6 23:24:22 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/curator/test/BaseClassForTests.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/eaebdd95/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
----------------------------------------------------------------------
diff --git a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
index 7c4af65..9ae6a5d 100644
--- a/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
+++ b/curator-test/src/main/java/org/apache/curator/test/BaseClassForTests.java
@@ -160,6 +160,7 @@ public class BaseClassForTests
return false;
}
+ result.setStatus(ITestResult.SKIP);
if ( result.getThrowable() != null )
{
log.error("Retrying 1 time", result.getThrowable());