From 9a1a7eb8c47f47de12c56e16113a9cd1814bd530 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Mon, 8 Apr 2019 18:33:54 +0800
Subject: [PATCH] HBASE-22188 Make TestSplitMerge more stable

---
 .../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 5f966784585..641e52e1155 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)) {