Author: todd
Date: Fri Apr  6 05:32:02 2012
New Revision: 1310176

URL: http://svn.apache.org/viewvc?rev=1310176&view=rev
Log:
Fix trivial mistake in test code in previous merge - tests were failing due to 
misuse of NodeFencer.create

Modified:
    
hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java

Modified: 
hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java?rev=1310176&r1=1310175&r2=1310176&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
 (original)
+++ 
hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/DummyHAService.java
 Fri Apr  6 05:32:02 2012
@@ -37,6 +37,7 @@ import com.google.common.collect.Lists;
  */
 class DummyHAService extends HAServiceTarget {
   public static final Log LOG = LogFactory.getLog(DummyHAService.class);
+  private static final String DUMMY_FENCE_KEY = "dummy.fence.key";
   volatile HAServiceState state;
   HAServiceProtocol proxy;
   NodeFencer fencer;
@@ -55,8 +56,9 @@ class DummyHAService extends HAServiceTa
     this.proxy = makeMock();
     try {
       Configuration conf = new Configuration();
-      this.fencer = Mockito.spy(NodeFencer.create(conf,
-          DummyFencer.class.getName()));
+      conf.set(DUMMY_FENCE_KEY, DummyFencer.class.getName()); 
+      this.fencer = Mockito.spy(
+          NodeFencer.create(conf, DUMMY_FENCE_KEY));
     } catch (BadFencingConfigurationException e) {
       throw new RuntimeException(e);
     }


Reply via email to