From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 10 Jul 2011 13:03:49 +0000 (+0000)
Subject: Disable one test validation in TestAsyncContextImpl
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=02b61eef1c7bc2c506347a55444c4db9ad7806b4;p=tomcat7.0

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.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144854 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 146375c21..efb5fa76f 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -452,8 +452,10 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 
         // 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 +