[java-idp-integration-tests] branch main updated: Delete empty Tomcat ROOT webapp

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=ccaccabf3fd5df182af3e344052b72344bb5da5d

The following commit(s) were added to refs/heads/main by this push:
     new ccaccab  Delete empty Tomcat ROOT webapp
ccaccab is described below

commit ccaccabf3fd5df182af3e344052b72344bb5da5d
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Dec 18 07:40:14 2023 -0600

    Delete empty Tomcat ROOT webapp
    
    If ROOT webapp exists, the testbed will not be available since it needs
    to be the ROOT webapp.
    
    Tomcat requires (?) the ROOT webapp to exist.
---
 .../shibboleth/idp/integration/tests/BaseIntegrationTest.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index 0a80c9f..530c20b 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -549,6 +549,15 @@ public abstract class BaseIntegrationTest {
             // Make tmp directories exist
             Assert.assertTrue(pathToTomcatBase.resolve("temp").toFile().exists(), "Path to temp/ not found");
             
+            // Delete webapps/ROOT directory if it exists
+            final Path pathToRootWebapp = pathToTomcatBase.resolve(Paths.get("webapps", "ROOT"));
+            log.trace("Path to ROOT webapp '{}'", pathToRootWebapp.toAbsolutePath());
+            if (pathToRootWebapp.toAbsolutePath().toFile().exists()) {
+                log.debug("Deleting ROOT webapp '{}'", pathToRootWebapp.toAbsolutePath());
+                final boolean deleteRootWebapp = FileSystemUtils.deleteRecursively(pathToRootWebapp);
+                log.trace("Deleted ROOT webapp '{}' result '{}'", pathToRootWebapp.toAbsolutePath(), deleteRootWebapp);
+            }
+
             // Modify setenv.sh and setenv.bat with per-test idp.home directory
             final Path pathToSetenvSh = pathToTomcatBase.resolve(Paths.get("bin", "setenv.sh"));
             Assert.assertTrue(pathToSetenvSh.toAbsolutePath().toFile().exists(), "Path to setenv.sh not found");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.