[hbase] branch branch-2 updated: HBASE-22188 Make TestSplitMerge more stable

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 9a1a7eb  HBASE-22188 Make TestSplitMerge more stable
9a1a7eb is described below

commit 9a1a7eb8c47f47de12c56e16113a9cd1814bd530
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Apr 8 18:33:54 2019 +0800

    HBASE-22188 Make TestSplitMerge more stable
---
 hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
index 5f96678..641e52e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
@@ -79,6 +79,7 @@ public class TestSplitMerge {
         return "Split has not finished yet";
       }
     });
+    UTIL.waitUntilNoRegionsInTransition();
     RegionInfo regionA = null;
     RegionInfo regionB = null;
     for (RegionInfo region : UTIL.getAdmin().getRegions(tableName)) {