svn commit: r1612867 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/ReconfigTest.java

[ph...@apache.org]

Author: phunt
Date: Wed Jul 23 16:35:52 2014
New Revision: 1612867

URL: http://svn.apache.org/r1612867
Log:
ZOOKEEPER-1984. testLeaderTimesoutOnNewQuorum is a flakey test (Alex Shraer via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1612867&r1=1612866&r2=1612867&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Jul 23 16:35:52 2014
@@ -726,6 +726,9 @@ BUGFIXES:
   ZOOKEEPER-1981. Fix Dodgy Code Warnings identified by findbugs 2.0.3
   (Hongchao Deng via phunt)
 
+  ZOOKEEPER-1984. testLeaderTimesoutOnNewQuorum is a flakey test
+  (Alex Shraer via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java?rev=1612867&r1=1612866&r2=1612867&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ReconfigTest.java Wed Jul 23 16:35:52 2014
@@ -442,13 +442,6 @@ public class ReconfigTest extends ZKTest
                 qu.getPeer(1).peer.getServerState());
         Assert.assertEquals(QuorumStats.Provider.LOOKING_STATE,
                 qu.getPeer(3).peer.getServerState());
-
-        qu.restart(2);
-
-        // Now that 2 is back up, they'll complete the reconfig removing 3 and
-        // can process other ops.
-        testServerHasConfig(zkArr[1], null, leavingServers);
-        testNormalOperation(zkArr[1], zkArr[2]);
         closeAllHandles(zkArr);
     }