Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 1374321:1374322 from trunk. FIXES: HADOOP-8693 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374323 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-08-17 15:37:00 +00:00
parent cf57897b96
commit 1c7758d9a4
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -739,6 +739,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7
(Trevor Robinson via tgraves)
HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor
Robinson via tgraves)
Release 0.23.2 - UNRELEASED
NEW FEATURES

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
View File

@ -137,6 +137,7 @@ public class TestSecurityUtil {
@Test
public void testBuildDTServiceName() {
SecurityUtil.setTokenServiceUseIp(true);
assertEquals("127.0.0.1:123",
SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123)
);
@ -153,6 +154,7 @@ public class TestSecurityUtil {
@Test
public void testBuildTokenServiceSockAddr() {
SecurityUtil.setTokenServiceUseIp(true);
assertEquals("127.0.0.1:123",
SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString()
);