merge -r 1396704:1396705 from trunk. FIXES: HDFS-3824

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396706 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-10-10 17:37:54 +00:00
parent 13fe2bd483
commit 1f4ba537fa
2 changed files with 6 additions and 1 deletions

View File

@ -1545,6 +1545,9 @@ Release 0.23.5 - UNRELEASED
HDFS-3829. TestHftpURLTimeouts fails intermittently with JDK7 (Trevor
Robinson via tgraves)
HDFS-3824. TestHftpDelegationToken fails intermittently with JDK7 (Trevor
Robinson via tgraves)
Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -41,6 +41,8 @@ public class TestHftpDelegationToken {
@Test
public void testHdfsDelegationToken() throws Exception {
SecurityUtilTestHelper.setTokenServiceUseIp(true);
final Configuration conf = new Configuration();
conf.set(HADOOP_SECURITY_AUTHENTICATION, "kerberos");
UserGroupInformation.setConfiguration(conf);
@ -265,4 +267,4 @@ public class TestHftpDelegationToken {
@Override
protected void initDelegationToken() throws IOException {}
}
}
}