You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2013/10/23 01:15:23 UTC
svn commit: r1534842 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
Author: phunt
Date: Tue Oct 22 23:15:22 2013
New Revision: 1534842
URL: http://svn.apache.org/r1534842
Log:
ZOOKEEPER-1799. SaslAuthFailDesignatedClientTest.testAuth fails frequently on SUSE (Jeffrey Zhong via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1534842&r1=1534841&r2=1534842&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Oct 22 23:15:22 2013
@@ -456,6 +456,9 @@ BUGFIXES:
ZOOKEEPER-1667. Watch event isn't handled correctly when
a client reestablish to a server (jacky007, fpj via fpj)
+ ZOOKEEPER-1799. SaslAuthFailDesignatedClientTest.testAuth fails
+ frequently on SUSE (Jeffrey Zhong via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java?rev=1534842&r1=1534841&r2=1534842&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java Tue Oct 22 23:15:22 2013
@@ -21,10 +21,12 @@ package org.apache.zookeeper.test;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.TestableZooKeeper;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.Watcher.Event.KeeperState;
@@ -84,7 +86,14 @@ public class SaslAuthFailDesignatedClien
@Test
public void testAuth() throws Exception {
- ZooKeeper zk = createClient();
+ // Cannot use createClient here because server may close session before
+ // JMXEnv.ensureAll is called which will fail the test case
+ CountdownWatcher watcher = new CountdownWatcher();
+ TestableZooKeeper zk = new TestableZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher);
+ if (!watcher.clientConnected.await(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS))
+ {
+ Assert.fail("Unable to connect to server");
+ }
try {
zk.create("/path1", null, Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);
Assert.fail("Should have gotten exception.");