svn commit: r1414233 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java

[fpj]

Author: fpj
Date: Tue Nov 27 15:52:45 2012
New Revision: 1414233

URL: http://svn.apache.org/viewvc?rev=1414233&view=rev
Log:
BOOKKEEPER-477: In ReadOnlyBookieTest, we should wait for the bookie to die 
before asserting on it (ivank via fpj)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1414233&r1=1414232&r2=1414233&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Nov 27 15:52:45 2012
@@ -108,6 +108,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-460: LedgerDeleteTest checks wrong place for log file 
(Fangmin Lv via ivank)
 
+       BOOKKEEPER-477: In ReadOnlyBookieTest, we should wait for the bookie to 
die before asserting on it (ivank via fpj)
+
       hedwig-protocol:
 
         BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via 
sijie)

Modified: 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java?rev=1414233&r1=1414232&r2=1414233&view=diff
==============================================================================
--- 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
 (original)
+++ 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
 Tue Nov 27 15:52:45 2012
@@ -109,6 +109,10 @@ public class ReadOnlyBookieTest extends 
             // Expected
         }
 
+        // wait for up to 10 seconds for bookie to shut down
+        for (int i = 0; i < 10 && bookie.isAlive(); i++) {
+            Thread.sleep(1000);
+        }
         assertFalse("Bookie should shutdown if readOnlyMode not enabled",
                 bookie.isAlive());
     }