HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in the network. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493451 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
769a0bd831
commit
18a4cb4872
|
@ -585,6 +585,9 @@ Release 2.1.0-beta - UNRELEASED
|
||||||
HADOOP-9638. Parallel test changes caused invalid test path for several HDFS
|
HADOOP-9638. Parallel test changes caused invalid test path for several HDFS
|
||||||
tests on Windows (Andrey Klochkov via cnauroth)
|
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
|
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
|
||||||
|
|
||||||
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class TestShellCommandFencer {
|
||||||
private ShellCommandFencer fencer = createFencer();
|
private ShellCommandFencer fencer = createFencer();
|
||||||
private static final HAServiceTarget TEST_TARGET =
|
private static final HAServiceTarget TEST_TARGET =
|
||||||
new DummyHAService(HAServiceState.ACTIVE,
|
new DummyHAService(HAServiceState.ACTIVE,
|
||||||
new InetSocketAddress("host", 1234));
|
new InetSocketAddress("dummyhost", 1234));
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void setupLogSpy() {
|
public static void setupLogSpy() {
|
||||||
|
@ -140,13 +140,13 @@ public class TestShellCommandFencer {
|
||||||
@Test
|
@Test
|
||||||
public void testTargetAsEnvironment() {
|
public void testTargetAsEnvironment() {
|
||||||
if (!Shell.WINDOWS) {
|
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.verify(ShellCommandFencer.LOG).info(
|
||||||
Mockito.endsWith("echo $ta...t_address: host 1234 host:1234"));
|
Mockito.endsWith("echo $ta...rget_port: dummyhost 1234"));
|
||||||
} else {
|
} 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.verify(ShellCommandFencer.LOG).info(
|
||||||
Mockito.endsWith("echo %ta..._address%: host 1234 host:1234"));
|
Mockito.endsWith("echo %ta...get_port%: dummyhost 1234"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue