Author: arp
Date: Wed Jan 29 04:41:46 2014
New Revision: 1562355
URL: http://svn.apache.org/r1562355
Log:
HADOOP-10291. Merging r1562353 from trunk to branch-2
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1562355&r1=1562354&r2=1562355&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 29 04:41:46 2014
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1562355&r1=1562354&r2=1562355&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Wed Jan 29 04:41:46 2014
@@ -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
