Author: markt
Date: Sun Apr 28 22:04:06 2013
New Revision: 1476846
URL: http://svn.apache.org/r1476846
Log:
Port unit test changes from trunk that should allow ASF CI system to complete
without error
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1476761,1476805,1476815
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1476846&r1=1476845&r2=1476846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Sun Apr 28 22:04:06 2013
@@ -261,7 +261,7 @@ standardWrapper.statusTitle=Tomcat Error
standardWrapper.unavailable=Marking servlet {0} as unavailable
standardWrapper.unloadException=Servlet {0} threw unload() exception
standardWrapper.unloading=Cannot allocate servlet {0} because it is being
unloaded
-standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated
+standardWrapper.waiting=Waiting for {0} instance(s) to be deallocated for
Servlet [{1}]
threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing
lifecycle event {0}
threadLocalLeakPreventionListener.containerEvent.error=Exception processing
container event {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1476846&r1=1476845&r2=1476846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun
Apr 28 22:04:06 2013
@@ -1448,7 +1448,8 @@ public class StandardWrapper extends Con
while ((nRetries < 21) && (countAllocated.get() > 0)) {
if ((nRetries % 10) == 0) {
log.info(sm.getString("standardWrapper.waiting",
- countAllocated.toString()));
+ countAllocated.toString(),
+ getName()));
}
try {
Thread.sleep(delay);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1476846&r1=1476845&r2=1476846&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
Sun Apr 28 22:04:06 2013
@@ -297,7 +297,13 @@ public class TestVirtualContext extends
private void assertPageContains(String pageUrl, String expectedBody,
int expectedStatus) throws IOException {
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() + pageUrl, res, 3000,
+ // Note: With a read timeout of 3s the ASF CI buildbot was consistently
+ // seeing failures with this test. The failures were due to the
+ // JSP initialisation taking longer than the read timeout. The
+ // root cause of this is the frequent poor IO performance of the
+ // VM running the buildbot instance. Increasing this to 10s
should
+ // avoid these failures.
+ int sc = getUrl("http://localhost:"; + getPort() + pageUrl, res, 10000,
null, null);
assertEquals(expectedStatus, sc);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
