You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2011/09/23 03:13:48 UTC

svn commit: r1174477 - in /hadoop/common/branches/branch-0.20-security-205: ./ src/test/org/apache/hadoop/security/authentication/client/ src/test/org/apache/hadoop/security/authentication/server/

Author: jitendra
Date: Fri Sep 23 01:13:48 2011
New Revision: 1174477

URL: http://svn.apache.org/viewvc?rev=1174477&view=rev
Log:
HADOOP-7645. HTTP auth tests requiring Kerberos infrastructure are not disabled on branch-0.20-security.

Modified:
    hadoop/common/branches/branch-0.20-security-205/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java
    hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1174477&r1=1174476&r2=1174477&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Fri Sep 23 01:13:48 2011
@@ -34,6 +34,9 @@ Release 0.20.205.0 - 2011.09.12
     HDFS-2284. Add a new FileSystem, webhdfs://, for supporting write Http
     access to HDFS.  (szetszwo)
 
+    HADOOP-7645. HTTP auth tests requiring Kerberos infrastructure are not 
+    disabled on branch-0.20-security. (jitendra)
+
   BUG FIXES
 
     MAPREDUCE-2324. Removed usage of broken

Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 01:13:48 2011
@@ -1,6 +1,6 @@
 /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
 /hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326,1174471
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326,1174471,1174476
 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
 /hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226

Modified: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java?rev=1174477&r1=1174476&r2=1174477&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/client/TestKerberosAuthenticator.java Fri Sep 23 01:13:48 2011
@@ -17,12 +17,15 @@ import org.apache.hadoop.security.authen
 import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
 import org.apache.hadoop.security.authentication.server.PseudoAuthenticationHandler;
 import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
+import org.junit.Ignore;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+//Disabled because kerberos setup and valid keytabs are required.
+@Ignore("requires kerberos setup")
 public class TestKerberosAuthenticator extends AuthenticatorTestCase {
 
   private Properties getAuthenticationHandlerConfiguration() {

Modified: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java?rev=1174477&r1=1174476&r2=1174477&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java Fri Sep 23 01:13:48 2011
@@ -21,6 +21,7 @@ import org.apache.commons.codec.binary.B
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.GSSName;
+import org.junit.Ignore;
 import org.mockito.Mockito;
 import sun.security.jgss.GSSUtil;
 
@@ -29,6 +30,8 @@ import javax.servlet.http.HttpServletRes
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
+//Disabled because kerberos setup and valid keytabs are required.
+@Ignore("requires kerberos setup")
 public class TestKerberosAuthenticationHandler extends TestCase {
 
   private KerberosAuthenticationHandler handler;