svn commit: r1530155 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java

[phunt]

Author: phunt
Date: Tue Oct  8 05:27:13 2013
New Revision: 1530155

URL: http://svn.apache.org/r1530155
Log:
ZOOKEEPER-1774. QuorumPeerMainTest fails consistently with complains about 
host" assertion failure (phunt)

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

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1530155&r1=1530154&r2=1530155&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Oct  8 05:27:13 2013
@@ -122,6 +122,9 @@ BUGFIXES:
   ZOOKEEPER-1551. Observers ignore txns that come after snapshot and UPTODATE
   (thawan, fpj via thawan)
 
+  ZOOKEEPER-1774. QuorumPeerMainTest fails consistently with
+  "complains about host" assertion failure (phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1564. Allow JUnit test build with IBM Java

Modified: 
zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java?rev=1530155&r1=1530154&r2=1530155&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
 (original)
+++ 
zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
 Tue Oct  8 05:27:13 2013
@@ -406,7 +406,7 @@ public class QuorumPeerMainTest extends 
 
             boolean isup =
                 ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT_QP1,
-                        5000);
+                        30000);
 
             Assert.assertFalse("Server never came up", isup);