Author: markt
Date: Tue Jul 5 13:13:07 2016
New Revision: 1751463
URL: http://svn.apache.org/viewvc?rev=1751463&view=rev
Log:
Force shorter session timeouts during authentication tests to speed them up
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1751463&r1=1751462&r2=1751463&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Jul 5 13:13:07 2016
@@ -95,9 +95,8 @@ public class TestFormAuthenticator exten
protected static final boolean SERVER_FREEZE_SESSID =
!SERVER_CHANGE_SESSID;
// minimum session timeout
- private static final int TIMEOUT_MINS = 1;
- private static final long TIMEOUT_DELAY_MSECS =
- (((TIMEOUT_MINS * 60) + 10) * 1000);
+ private static final int SHORT_SESSION_TIMEOUT_SECS = 1;
+ private static final long TIMEOUT_DELAY_MSECS =
((SHORT_SESSION_TIMEOUT_SECS + 10) * 1000);
private FormAuthClient client;
@@ -239,6 +238,10 @@ public class TestFormAuthenticator exten
CLIENT_NO_COOKIES, SERVER_USE_COOKIES,
SERVER_FREEZE_SESSID);
+ // Force session to expire one second from now
+ Context context = (Context)
getTomcatInstance().getHost().findChildren()[0];
+ forceSessionMaxInactiveInterval(context, SHORT_SESSION_TIMEOUT_SECS);
+
// wait long enough for my session to expire
Thread.sleep(TIMEOUT_DELAY_MSECS);
@@ -656,9 +659,6 @@ public class TestFormAuthenticator exten
tomcat.start();
- // perhaps this does not work until tomcat has started?
- ctx.setSessionTimeout(TIMEOUT_MINS);
-
// Valve pipeline is only established after tomcat starts
Valve[] valves = ctx.getPipeline().getValves();
for (Valve valve : valves) {
@@ -734,9 +734,6 @@ public class TestFormAuthenticator exten
tomcat.start();
- // perhaps this does not work until tomcat has started?
- ctx.setSessionTimeout(TIMEOUT_MINS);
-
// Valve pipeline is only established after tomcat starts
Valve[] valves = ctx.getPipeline().getValves();
for (Valve valve : valves) {
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1751463&r1=1751462&r2=1751463&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
Tue Jul 5 13:13:07 2016
@@ -75,15 +75,14 @@ public class TestNonLoginAndBasicAuthent
private static final String URI_PROTECTED = "/protected";
private static final String URI_PUBLIC = "/anyoneCanAccess";
- private static final int SHORT_SESSION_TIMEOUT_MINS = 1;
- private static final int LONG_SESSION_TIMEOUT_MINS = 2;
- private static final int MANAGER_SCAN_INTERVAL_SECS = 10;
+ private static final int SHORT_SESSION_TIMEOUT_SECS = 1;
+ private static final int MANAGER_SCAN_INTERVAL_SECS = 2;
private static final int MANAGER_EXPIRE_SESSIONS_FAST = 1;
private static final int EXTRA_DELAY_SECS = 5;
private static final long TIMEOUT_DELAY_MSECS =
- (((SHORT_SESSION_TIMEOUT_MINS * 60)
- + (MANAGER_SCAN_INTERVAL_SECS * MANAGER_EXPIRE_SESSIONS_FAST)
- + EXTRA_DELAY_SECS) * 1000);
+ ((SHORT_SESSION_TIMEOUT_SECS +
+ (MANAGER_SCAN_INTERVAL_SECS *
MANAGER_EXPIRE_SESSIONS_FAST) +
+ EXTRA_DELAY_SECS) * 1000);
private static final String CLIENT_AUTH_HEADER = "authorization";
private static final String SERVER_AUTH_HEADER = "WWW-Authenticate";
@@ -287,6 +286,11 @@ public class TestNonLoginAndBasicAuthent
doTestBasic(CONTEXT_PATH_LOGIN + URI_PROTECTED, NO_CREDENTIALS,
USE_COOKIES, HttpServletResponse.SC_OK);
+ // Force session to expire one second from now
+ forceSessionMaxInactiveInterval(
+ (Context)
getTomcatInstance().getHost().findChild(CONTEXT_PATH_LOGIN),
+ SHORT_SESSION_TIMEOUT_SECS);
+
// allow the session to time out and lose authentication
Thread.sleep(TIMEOUT_DELAY_MSECS);
@@ -451,7 +455,6 @@ public class TestNonLoginAndBasicAuthent
// Must have a real docBase for webapps - just use temp
nonloginContext = tomcat.addContext(CONTEXT_PATH_NOLOGIN,
System.getProperty("java.io.tmpdir"));
- nonloginContext.setSessionTimeout(LONG_SESSION_TIMEOUT_MINS);
// Add protected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet1", new
TesterServlet());
@@ -488,7 +491,6 @@ public class TestNonLoginAndBasicAuthent
// Must have a real docBase for webapps - just use temp
basicContext = tomcat.addContext(CONTEXT_PATH_LOGIN,
System.getProperty("java.io.tmpdir"));
- basicContext.setSessionTimeout(SHORT_SESSION_TIMEOUT_MINS);
// Add protected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet3", new TesterServlet());
@@ -536,7 +538,8 @@ public class TestNonLoginAndBasicAuthent
* with a session expiry scan every 6 cycles.
*/
private void setRapidSessionTimeout() {
-
+ basicContext.getParent().getParent().setBackgroundProcessorDelay(
+ MANAGER_SCAN_INTERVAL_SECS);
((ManagerBase) basicContext.getManager())
.setProcessExpiresFrequency(MANAGER_EXPIRE_SESSIONS_FAST);
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1751463&r1=1751462&r2=1751463&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jul
5 13:13:07 2016
@@ -55,6 +55,7 @@ import org.apache.catalina.LifecycleStat
import org.apache.catalina.Manager;
import org.apache.catalina.Server;
import org.apache.catalina.Service;
+import org.apache.catalina.Session;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.AprLifecycleListener;
@@ -107,6 +108,11 @@ public abstract class TomcatBaseTest ext
File appDir = new File("test/webapp");
Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+ StandardJarScanner scanner = (StandardJarScanner) ctx.getJarScanner();
+ StandardJarScanFilter filter = (StandardJarScanFilter)
scanner.getJarScanFilter();
+ filter.setTldSkip(filter.getTldSkip() + ",testclasses");
+ filter.setPluggabilitySkip(filter.getPluggabilitySkip() +
",testclasses");
+
if (addJstl) {
File lib = new File("webapps/examples/WEB-INF/lib");
ctx.setResources(new StandardRoot(ctx));
@@ -866,4 +872,12 @@ public abstract class TomcatBaseTest ext
StandardJarScanFilter filter = (StandardJarScanFilter)
scanner.getJarScanFilter();
filter.setTldSkip(filter.getTldSkip() + ",resources*.jar");
}
+
+
+ public static void forceSessionMaxInactiveInterval(Context context, int
newIntervalSecs) {
+ Session[] sessions = context.getManager().findSessions();
+ for (Session session : sessions) {
+ session.setMaxInactiveInterval(newIntervalSecs);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
