HADOOP-9500. Merge r1476606 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486177 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-05-24 19:19:46 +00:00
parent f05a2e5b69
commit fe81cd68c8
2 changed files with 6 additions and 1 deletions

View File

@ -336,6 +336,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9290. Some tests cannot load native library on windows. HADOOP-9290. Some tests cannot load native library on windows.
(Chris Nauroth via suresh) (Chris Nauroth via suresh)
HADOOP-9500. TestUserGroupInformation#testGetServerSideGroups fails on
Windows due to failure to find winutils.exe. (Chris Nauroth via suresh)
Release 2.0.4-beta - UNRELEASED Release 2.0.4-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -75,7 +75,9 @@ public class TestUserGroupInformation {
javax.security.auth.login.Configuration.setConfiguration( javax.security.auth.login.Configuration.setConfiguration(
new DummyLoginConfiguration()); new DummyLoginConfiguration());
// doesn't matter what it is, but getGroups needs it set... // doesn't matter what it is, but getGroups needs it set...
System.setProperty("hadoop.home.dir", "/tmp"); // use HADOOP_HOME environment variable to prevent interfering with logic
// that finds winutils.exe
System.setProperty("hadoop.home.dir", System.getenv("HADOOP_HOME"));
// fake the realm is kerberos is enabled // fake the realm is kerberos is enabled
System.setProperty("java.security.krb5.kdc", ""); System.setProperty("java.security.krb5.kdc", "");
System.setProperty("java.security.krb5.realm", "DEFAULT.REALM"); System.setProperty("java.security.krb5.realm", "DEFAULT.REALM");