svn commit: r1666765 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/test/org/apache/zookeeper/test/ReconfigTest.java

[michim]

Author: michim
Date: Sat Mar 14 22:47:53 2015
New Revision: 1666765

URL: http://svn.apache.org/r1666765
Log:
ZOOKEEPER-2137 Make testPortChange() less flaky (Hongchao Deng via michim)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1666765&r1=1666764&r2=1666765&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Mar 14 22:47:53 2015
@@ -43,6 +43,8 @@ BUGFIXES:
   ZOOKEEPER-2134 AsyncHammerTest.testHammer fails intermittently
   (Michi Mutsuzaki via rakeshr)
 
+  ZOOKEEPER-2137 Make testPortChange() less flaky (Hongchao Deng via michim)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed 
Wanderman-Milne via shralex)
 

Modified: 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java?rev=1666765&r1=1666764&r2=1666765&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
 (original)
+++ 
zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReconfigTest.java
 Sat Mar 14 22:47:53 2015
@@ -595,7 +595,7 @@ public class ReconfigTest extends ZKTest
                 + ":participant;localhost:"
                 + qu.getPeer(leaderIndex).peer.getClientPort());
 
-        reconfig(zkArr[followerIndex], joiningServers, null, null, -1);
+        reconfig(zkArr[leaderIndex], joiningServers, null, null, -1);
 
         testNormalOperation(zkArr[followerIndex], zkArr[leaderIndex]);