Author: zjshen
Date: Tue Jul 22 15:17:13 2014
New Revision: 1612590
URL: http://svn.apache.org/r1612590
Log:
YARN-2319. Made the MiniKdc instance start/close before/after the class of
TestRMWebServicesDelegationTokens. Contributed by Wenwu Peng.
svn merge --ignore-ancestry -c 1612588 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1612590&r1=1612589&r2=1612590&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jul 22
15:17:13 2014
@@ -400,6 +400,9 @@ Release 2.5.0 - UNRELEASED
YARN-2270. Made TestFSDownload#testDownloadPublicWithStatCache be skipped
when thereâs no ancestor permissions. (Akira Ajisaka via zjshen)
+ YARN-2319. Made the MiniKdc instance start/close before/after the class of
+ TestRMWebServicesDelegationTokens. (Wenwu Peng via zjshen)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java?rev=1612590&r1=1612589&r2=1612590&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java
Tue Jul 22 15:17:13 2014
@@ -60,7 +60,9 @@ import org.apache.hadoop.yarn.webapp.Web
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -90,28 +92,14 @@ import com.sun.jersey.test.framework.Web
@RunWith(Parameterized.class)
public class TestRMWebServicesDelegationTokens extends JerseyTest {
- private static final File testRootDir = new File("target",
- TestRMWebServicesDelegationTokens.class.getName() + "-root");
+ private static File testRootDir;
private static File httpSpnegoKeytabFile = new File(
KerberosTestUtils.getKeytabFile());
-
private static String httpSpnegoPrincipal = KerberosTestUtils
.getServerPrincipal();
-
- private static boolean miniKDCStarted = false;
private static MiniKdc testMiniKDC;
- static {
- try {
- testMiniKDC = new MiniKdc(MiniKdc.createConf(), testRootDir);
- } catch (Exception e) {
- assertTrue("Couldn't create MiniKDC", false);
- }
- }
-
private static MockRM rm;
-
private Injector injector;
-
private boolean isKerberosAuth = false;
// Make sure the test uses the published header string
@@ -237,7 +225,6 @@ public class TestRMWebServicesDelegation
.contextListenerClass(GuiceServletConfig.class)
.filterClass(com.google.inject.servlet.GuiceFilter.class)
.contextPath("jersey-guice-filter").servletPath("/").build());
- setupKDC();
switch (run) {
case 0:
default:
@@ -249,17 +236,14 @@ public class TestRMWebServicesDelegation
}
}
- private void setupKDC() throws Exception {
- if (miniKDCStarted == false) {
- testMiniKDC.start();
- getKdc().createPrincipal(httpSpnegoKeytabFile, "HTTP/localhost",
- "client", "client2", "client3");
- miniKDCStarted = true;
- }
- }
-
- private MiniKdc getKdc() {
- return testMiniKDC;
+ @BeforeClass
+ public static void setupKDC() throws Exception {
+ testRootDir = new File("target",
+ TestRMWebServicesDelegationTokens.class.getName() + "-root");
+ testMiniKDC = new MiniKdc(MiniKdc.createConf(), testRootDir);
+ testMiniKDC.start();
+ testMiniKDC.createPrincipal(httpSpnegoKeytabFile, "HTTP/localhost",
+ "client", "client2", "client3");
}
@Before
@@ -270,6 +254,13 @@ public class TestRMWebServicesDelegation
testRootDir.deleteOnExit();
}
+ @AfterClass
+ public static void shutdownKdc() {
+ if (testMiniKDC != null) {
+ testMiniKDC.stop();
+ }
+ }
+
@After
@Override
public void tearDown() throws Exception {
