svn commit: r1556925 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java

[michim]

Author: michim
Date: Thu Jan  9 19:21:10 2014
New Revision: 1556925

URL: http://svn.apache.org/r1556925
Log:
ZOOKEEPER-1414. QuorumPeerMainTest.testQuorum, testBadPackets are failing 
intermittently (Rakesh R via michim)

Modified:
    zookeeper/trunk/CHANGES.txt
    
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1556925&r1=1556924&r2=1556925&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Jan  9 19:21:10 2014
@@ -516,6 +516,9 @@ BUGFIXES:
   ZOOKEEPER-1852. ServerCnxnFactory instance is not properly 
   cleanedup (Rakesh R via fpj)
 
+  ZOOKEEPER-1414. QuorumPeerMainTest.testQuorum, testBadPackets are failing
+  intermittently (Rakesh R via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: 
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java?rev=1556925&r1=1556924&r2=1556925&view=diff
==============================================================================
--- 
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
 (original)
+++ 
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
 Thu Jan  9 19:21:10 2014
@@ -82,7 +82,7 @@ public class QuorumPeerMainTest extends 
 
         ZooKeeper zk = new ZooKeeper("127.0.0.1:" + CLIENT_PORT_QP1,
                 ClientBase.CONNECTION_TIMEOUT, this);
-
+        waitForOne(zk, States.CONNECTED);
         zk.create("/foo_q1", "foobar1".getBytes(), Ids.OPEN_ACL_UNSAFE,
                 CreateMode.PERSISTENT);
         Assert.assertEquals(new String(zk.getData("/foo_q1", null, null)), 
"foobar1");
@@ -90,7 +90,7 @@ public class QuorumPeerMainTest extends 
 
         zk = new ZooKeeper("127.0.0.1:" + CLIENT_PORT_QP2,
                 ClientBase.CONNECTION_TIMEOUT, this);
-
+        waitForOne(zk, States.CONNECTED);
         zk.create("/foo_q2", "foobar2".getBytes(), Ids.OPEN_ACL_UNSAFE,
                 CreateMode.PERSISTENT);
         Assert.assertEquals(new String(zk.getData("/foo_q2", null, null)), 
"foobar2");
@@ -570,7 +570,7 @@ public class QuorumPeerMainTest extends 
 
         ZooKeeper zk = new ZooKeeper("127.0.0.1:" + CLIENT_PORT_QP1,
                 ClientBase.CONNECTION_TIMEOUT, this);
-
+        waitForOne(zk, States.CONNECTED);
         zk.create("/foo_q1", "foobar1".getBytes(), Ids.OPEN_ACL_UNSAFE,
                 CreateMode.PERSISTENT);
         Assert.assertEquals(new String(zk.getData("/foo_q1", null, null)), 
"foobar1");