(tomcat) branch main updated: testServlets may run second

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 10ffbb6333 testServlets may run second
10ffbb6333 is described below

commit 10ffbb63333badd14901f2fb1c9d7fe6748103e1
Author: remm <r...@apache.org>
AuthorDate: Tue Sep 24 16:54:19 2024 +0200

    testServlets may run second
---
 test/org/apache/catalina/manager/TestManagerWebapp.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java 
b/test/org/apache/catalina/manager/TestManagerWebapp.java
index dbe8c45b8f..adecc38f76 100644
--- a/test/org/apache/catalina/manager/TestManagerWebapp.java
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -58,6 +58,8 @@ public class TestManagerWebapp extends TomcatBaseTest {
      */
     @Test
     public void testServlets() throws Exception {
+        // Avoid possible locking failure due to deployment with the manager 
in testDeploy
+        ignoreTearDown = true;
         Tomcat tomcat = getTomcatInstance();
         tomcat.setAddDefaultWebXmlToWebapp(false);
         tomcat.addUser("admin", "sekr3t");


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org