From 874d3d4f5a5f3ba2ca9860738e31d1718187cccf Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 29 Jan 2014 04:38:45 +0000 Subject: [PATCH] HADOOP-10291. TestSecurityUtil#testSocketAddrWithIP fails due to test order dependency. (Contributed by Mit Desai) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562353 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 3880990a6c..bc560af475 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -664,6 +664,9 @@ Release 2.3.0 - UNRELEASED HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. (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 6636243ba0..8c60734c59 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 @@ -331,7 +331,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