Author: rjung
Date: Sun Jul 10 13:03:49 2011
New Revision: 1144854
URL: http://svn.apache.org/viewvc?rev=1144854&view=rev
Log:
Disable one test validation in TestAsyncContextImpl
if an AccessLogValve has been activated.
The test relies on receiving data via
StandardEngine.logAccess() which is already
handled by the other AccessLog.
By default no AccessLogValve is activated, so the
validation is still done.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1144854&r1=1144853&r2=1144854&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Sun
Jul 10 13:03:49 2011
@@ -452,8 +452,10 @@ public class TestAsyncContextImpl extend
// Check the access log
if (completeOnTimeout && dispatchUrl != null) {
- validateAccessLog(alv, 1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT +
- TIMEOUT_MARGIN + REQUEST_TIME);
+ if (!isAccessLogEnabled()) {
+ validateAccessLog(alv, 1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
+
+ TIMEOUT_MARGIN + REQUEST_TIME);
+ }
} else {
validateAccessLog(alv, 1, 200, TimeoutServlet.ASYNC_TIMEOUT,
TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
