From 01f6aee7d365362bc929112e50868675c6226194 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 29 Jan 2014 04:41:46 +0000 Subject: [PATCH] HADOOP-10291. Merging r1562353 from trunk to branch-2 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562355 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/security/TestSecurityUtil.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 61c3268c713..c022c5619a1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -374,6 +374,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2. (Haohui Mai via suresh) + HADOOP-10291. TestSecurityUtil#testSocketAddrWithIP fails due to test + order dependency. (Mit Desai via Arpit Agarwal) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java index f7096394133..53fede9e633 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java @@ -330,7 +330,9 @@ public class TestSecurityUtil { @Test public void testSocketAddrWithIP() { - verifyServiceAddr("127.0.0.1", "127.0.0.1"); + String staticHost = "127.0.0.1"; + NetUtils.addStaticResolution(staticHost, "localhost"); + verifyServiceAddr(staticHost, "127.0.0.1"); } @Test