svn commit: r1428103 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/security/TestSecurityUtil.java

[suresh]

Author: suresh
Date: Wed Jan  2 23:08:55 2013
New Revision: 1428103

URL: http://svn.apache.org/viewvc?rev=1428103&view=rev
Log:
HADOOP-9174. Merge change 1428102 from branch-1

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1428103&r1=1428102&r2=1428103&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Wed Jan  2 
23:08:55 2013
@@ -310,3 +310,5 @@ Branch-hadoop-1-win (branched from branc
     node is excluded, the nodes in the same nodegroup should also be excluded.
     (Meng Gong via szetszwo)
 
+    HADOOP-9174. TestSecurityUtil fails with Open JDK 7. (Arpit Agarwal via
+    suresh)

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java?rev=1428103&r1=1428102&r2=1428103&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/security/TestSecurityUtil.java
 Wed Jan  2 23:08:55 2013
@@ -114,6 +114,8 @@ public class TestSecurityUtil {
 
   @Test
   public void testBuildDTServiceName() {
+    SecurityUtil.setTokenServiceUseIp(true);
+
     assertEquals("127.0.0.1:123",
         SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123)
     );
@@ -130,6 +132,8 @@ public class TestSecurityUtil {
   
   @Test
   public void testBuildTokenServiceSockAddr() {
+    SecurityUtil.setTokenServiceUseIp(true);
+
     assertEquals("127.0.0.1:123",
         SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 
123)).toString()
     );