svn commit: r1493451 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java

[cnauroth]

Author: cnauroth
Date: Sun Jun 16 03:30:05 2013
New Revision: 1493451

URL: http://svn.apache.org/r1493451
Log:
HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in 
the network. Contributed by Chuan Liu.

Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1493451&r1=1493450&r2=1493451&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sun Jun 
16 03:30:05 2013
@@ -585,6 +585,9 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-9638. Parallel test changes caused invalid test path for several 
HDFS
     tests on Windows (Andrey Klochkov via cnauroth)
 
+    HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine 
in
+    the network. (Chuan Liu via cnauroth)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     HADOOP-8924. Hadoop Common creating package-info.java must not depend on

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java?rev=1493451&r1=1493450&r2=1493451&view=diff
==============================================================================
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
 Sun Jun 16 03:30:05 2013
@@ -36,7 +36,7 @@ public class TestShellCommandFencer {
   private ShellCommandFencer fencer = createFencer();
   private static final HAServiceTarget TEST_TARGET =
       new DummyHAService(HAServiceState.ACTIVE,
-          new InetSocketAddress("host", 1234));
+          new InetSocketAddress("dummyhost", 1234));
   
   @BeforeClass
   public static void setupLogSpy() {
@@ -140,13 +140,13 @@ public class TestShellCommandFencer {
   @Test
   public void testTargetAsEnvironment() {
     if (!Shell.WINDOWS) {
-      fencer.tryFence(TEST_TARGET, "echo $target_host $target_port 
$target_address");
+      fencer.tryFence(TEST_TARGET, "echo $target_host $target_port");
       Mockito.verify(ShellCommandFencer.LOG).info(
-          Mockito.endsWith("echo $ta...t_address: host 1234 host:1234"));
+          Mockito.endsWith("echo $ta...rget_port: dummyhost 1234"));
     } else {
-      fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port% 
%target_address%");
+      fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port%");
       Mockito.verify(ShellCommandFencer.LOG).info(
-          Mockito.endsWith("echo %ta..._address%: host 1234 host:1234"));
+          Mockito.endsWith("echo %ta...get_port%: dummyhost 1234"));
     }
   }