You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by hd...@apache.org on 2015/05/10 23:29:15 UTC
svn commit: r1678645 - in /zookeeper/trunk: ./ src/java/test/org/apache/zookeeper/server/quorum/ src/java/test/org/apache/zookeeper/test/

Author: hdeng
Date: Sun May 10 21:29:15 2015
New Revision: 1678645

URL: http://svn.apache.org/r1678645
Log:
ZOOKEEPER-2182 Several test suites are not running during pre-commit, because their names do not end with "Test". (Chris Nauroth via hdeng)

Added:
    zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
      - copied, changed from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
      - copied, changed from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetry.java
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
      - copied, changed from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
Removed:
    zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetry.java
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
Modified:
    zookeeper/trunk/CHANGES.txt

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1678645&r1=1678644&r2=1678645&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun May 10 21:29:15 2015
@@ -91,6 +91,8 @@ BUGFIXES:
 
   ZOOKEEPER-2062 RemoveWatchesTest takes forever to run (Chris Nauroth via rakeshr)
 
+  ZOOKEEPER-2182 Several test suites are not running during pre-commit, because their names do not end with "Test". (Chris Nauroth via hdeng)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  
 

Copied: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java (from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java)
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java?p2=zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java&p1=zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java&r1=1678529&r2=1678645&rev=1678645&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java Sun May 10 21:29:15 2015
@@ -37,7 +37,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ReconfigFailureCases extends QuorumPeerTestBase {
+public class ReconfigFailureCasesTest extends QuorumPeerTestBase {
 
     private QuorumUtil qu;
 

Copied: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java (from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetry.java)
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java?p2=zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java&p1=zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetry.java&r1=1678529&r2=1678645&rev=1678645&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetry.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java Sun May 10 21:29:15 2015
@@ -25,7 +25,7 @@ import org.apache.zookeeper.ZooKeeper.St
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ClientRetry extends ClientBase {
+public class ClientRetryTest extends ClientBase {
 
     @Override
     public void setUp() throws Exception {
@@ -58,6 +58,7 @@ public class ClientRetry extends ClientB
                 Assert.assertSame(s1,States.CONNECTED);
                 Assert.assertSame(s2,States.CONNECTING);
                 cdw1.reset();
+                zk.close();
                 cdw1.waitForDisconnected(CONNECTION_TIMEOUT);
                 cdw2.waitForConnected(CONNECTION_TIMEOUT);
                 Assert.assertSame(zk2.getState(),States.CONNECTED);

Copied: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java (from r1678529, zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java)
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java?p2=zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java&p1=zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java&r1=1678529&r2=1678645&rev=1678645&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java Sun May 10 21:29:15 2015
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
 
 import junit.framework.TestCase;
 
-public class WatchEventWhenAutoReset extends TestCase {
+public class WatchEventWhenAutoResetTest extends TestCase {
     protected static final Logger LOG = LoggerFactory
-            .getLogger(WatchEventWhenAutoReset.class);
+            .getLogger(WatchEventWhenAutoResetTest.class);
 
     // waiting time for expected condition
     private static final int TIMEOUT = 30000;