zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hd...@apache.org
Subject svn commit: r1678647 - in /zookeeper/branches/branch-3.5: ./ src/java/test/org/apache/zookeeper/server/quorum/ src/java/test/org/apache/zookeeper/test/
Date Sun, 10 May 2015 21:45:22 GMT
Author: hdeng
Date: Sun May 10 21:45:22 2015
New Revision: 1678647

URL: http://svn.apache.org/r1678647
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/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
      - copied, changed from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
      - copied, changed from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetry.java
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
      - copied, changed from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
Removed:
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetry.java
    zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1678647&r1=1678646&r2=1678647&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sun May 10 21:45:22 2015
@@ -91,6 +91,8 @@ BUGFIXES:
 
   ZOOKEEPER-2171 avoid reverse lookups in QuorumCnxManager (rgs via michim)
 
+  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/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
(from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java)
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java?p2=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java&p1=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java&r1=1678530&r2=1678647&rev=1678647&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
Sun May 10 21:45:22 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/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
(from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetry.java)
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java?p2=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java&p1=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetry.java&r1=1678530&r2=1678647&rev=1678647&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetry.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
Sun May 10 21:45:22 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/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
(from r1678530, zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java)
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java?p2=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java&p1=zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java&r1=1678530&r2=1678647&rev=1678647&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
Sun May 10 21:45:22 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;



Mime
View raw message