HDFS-3156. TestDFSHAAdmin is failing post HADOOP-8202. Contributed by Aaron T. Myers.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306517 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -360,6 +360,8 @@ Release 0.23.3 - UNRELEASED
 
     HDFS-3132. Fix findbugs warning on HDFS trunk. (todd)
 
+    HDFS-3156. TestDFSHAAdmin is failing post HADOOP-8202. (atm)
+
   BREAKDOWN OF HDFS-1623 SUBTASKS
 
     HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java

@@ -36,6 +36,7 @@ import org.apache.hadoop.ha.HAServiceStatus;
 import org.apache.hadoop.ha.HAServiceTarget;
 import org.apache.hadoop.ha.HealthCheckFailedException;
 import org.apache.hadoop.ha.NodeFencer;
+import org.apache.hadoop.test.MockitoUtil;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +80,7 @@ public class TestDFSHAAdmin {
 
   @Before
   public void setup() throws IOException {
-    mockProtocol = Mockito.mock(HAServiceProtocol.class);
+    mockProtocol = MockitoUtil.mockProtocol(HAServiceProtocol.class);
     tool = new DFSHAAdmin() {
 
       @Override