From 164df6bdd975b8daae064135aa579f3caecc1ab1 Mon Sep 17 00:00:00 2001
From: Chia-Ping Tsai <chia7712@gmail.com>
Date: Wed, 26 Jul 2017 20:29:14 +0800
Subject: [PATCH] HBASE-18449 Fix client.locking.TestEntityLocks

---
 .../apache/hadoop/hbase/client/locking/TestEntityLocks.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
index 904c36dfc82..4ac3654203f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/locking/TestEntityLocks.java
@@ -192,6 +192,9 @@ public class TestEntityLocks {
     lock.requestLock();
     lock.await();
     assertTrue(waitLockTimeOut(lock, 100 * workerSleepTime));
+    while (lock.getWorker().isAlive()) {
+      TimeUnit.MILLISECONDS.sleep(100);
+    }
     verify(abortable, times(1)).abort(any(), isA(HBaseIOException.class));
     assertFalse(lock.getWorker().isAlive());
   }