HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
apache · Jan 9, 2020 · fbf660c · fbf660c
1 parent 9a2a799
commit fbf660c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/...e-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/...e-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.master.cleaner;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -545,8 +544,6 @@ public void testAsyncSnapshotWillNotBlockSnapshotHFileCleaner() throws Exception
         snapshotName, TABLE_NAME, SnapshotType.FLUSH));
     Waiter.waitFor(UTIL.getConfiguration(), 10 * 1000L, 200L,
       () -> UTIL.getAdmin().listSnapshots(Pattern.compile(snapshotName)).size() == 1);
-    assertTrue(master.getSnapshotManager().isTakingAnySnapshot());
-    future.get();
-    assertFalse(master.getSnapshotManager().isTakingAnySnapshot());
+    UTIL.waitFor(30000, () -> !master.getSnapshotManager().isTakingAnySnapshot());
   }
 }