svn commit: r1587398 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java

[larsh]

Author: larsh
Date: Tue Apr 15 03:59:53 2014
New Revision: 1587398

URL: http://svn.apache.org/r1587398
Log:
HBASE-10982 TestZKProcedure.testMultiCohortWithMemberTimeoutDuringPrepare fails 
frequently in 0.94.

Modified:
    
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java

Modified: 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java?rev=1587398&r1=1587397&r2=1587398&view=diff
==============================================================================
--- 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
 (original)
+++ 
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java
 Tue Apr 15 03:59:53 2014
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEqu
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -316,7 +317,9 @@ public class TestZKProcedure {
     // -------------
     // verification
     // -------------
-    waitAndVerifyProc(coordinatorTask, once, never(), once, once, true);
+    // always expect prepared, never committed, and possible to have cleanup 
and finish (racy since
+    // error case)
+    waitAndVerifyProc(coordinatorTask, once, never(), once, atMost(1), true);
     verifyCohortSuccessful(expected, subprocFactory, cohortTasks, once, 
never(), once,
       once, true);