From cdf539a8e0eac7f16401df96169bbbbe103005fb Mon Sep 17 00:00:00 2001
From: Stephen Yuan Jiang <syuanjiangdev@gmail.com>
Date: Mon, 28 Nov 2016 23:18:42 -0800
Subject: [PATCH] HBASE-17189 TestMasterObserver#wasModifyTableActionCalled
 uses wrong variables (Stephen Yuan Jiang)

---
 .../hadoop/hbase/coprocessor/TestMasterObserver.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index 816990e6204..54745f53c0e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -793,12 +793,20 @@ public class TestMasterObserver {
       preShutdownCalled = true;
     }
 
+    public boolean wasShutdownCalled() {
+      return preShutdownCalled;
+    }
+
     @Override
     public void preStopMaster(ObserverContext<MasterCoprocessorEnvironment> env)
         throws IOException {
       preStopMasterCalled = true;
     }
 
+    public boolean wasStopMasterCalled() {
+      return preStopMasterCalled;
+    }
+
     @Override
     public void preMasterInitialization(
         ObserverContext<MasterCoprocessorEnvironment> ctx) throws IOException {
@@ -1017,11 +1025,11 @@ public class TestMasterObserver {
     }
 
     public boolean wasModifyTableHandlerCalled() {
-      return preModifyColumnHandlerCalled && postModifyColumnHandlerCalled;
+      return preModifyTableHandlerCalled && postModifyTableHandlerCalled;
     }
 
     public boolean wasModifyTableHandlerCalledOnly() {
-      return preModifyColumnHandlerCalled && !postModifyColumnHandlerCalled;
+      return preModifyTableHandlerCalled && !postModifyTableHandlerCalled;
     }
 
     @Override