Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83CBF17B4A for ; Thu, 14 May 2015 19:56:48 +0000 (UTC) Received: (qmail 87488 invoked by uid 500); 14 May 2015 19:56:48 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 87464 invoked by uid 500); 14 May 2015 19:56:48 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 87453 invoked by uid 99); 14 May 2015 19:56:48 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2015 19:56:48 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 3B5B7AC0043 for ; Thu, 14 May 2015 19:56:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1679446 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java Date: Thu, 14 May 2015 19:56:48 -0000 To: commits@zookeeper.apache.org From: rgs@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150514195648.3B5B7AC0043@hades.apache.org> 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); } /**