Author: rgs
Date: Thu May 14 19:56:47 2015
New Revision: 1679446

URL: http://svn.apache.org/r1679446
Log:
ZOOKEEPER-2190 fix StandaloneDisabledTest#testReconfig

In StandaloneDisabledTest, testReconfig() shouldn't take leaving servers
as joining servers (Hongchao Deng via rgs).

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

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1679446&r1=1679445&r2=1679446&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu May 14 19:56:47 2015
@@ -93,6 +93,9 @@ BUGFIXES:
 
   ZOOKEEPER-2182 Several test suites are not running during pre-commit, because their names do not end with "Test". (Chris Nauroth via hdeng)
 
+  ZOOKEEPER-2190 In StandaloneDisabledTest, testReconfig() shouldn't take
+  leaving servers as joining servers (Hongchao Deng via rgs)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
 

Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java?rev=1679446&r1=1679445&r2=1679446&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java (original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java Thu May 14 19:56:47 2015
@@ -27,12 +27,8 @@ import org.apache.zookeeper.KeeperExcept
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.PortAssignment;
 import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.TestableZooKeeper;
 import org.apache.zookeeper.test.ClientBase;
 import org.apache.zookeeper.test.ReconfigTest;
-import org.apache.zookeeper.AsyncCallback.StatCallback;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -231,11 +227,12 @@ public class StandaloneDisabledTest exte
                 int id2 = Integer.parseInt(server.substring(7, 8)); //server.#
                 ReconfigTest.testNormalOperation(zkHandles[id], zkHandles[id2]);
             }
+            ReconfigTest.testServerHasConfig(zkHandles[id], servers, null);
         } else {
             ReconfigTest.reconfig(zkHandles[id], null, servers, null, -1);
+            ReconfigTest.testServerHasConfig(zkHandles[id], null, servers);
         }
 
-        ReconfigTest.testServerHasConfig(zkHandles[id], servers, null);
     }
 
    /**