[java-idp-integration-tests] branch main updated: Support testing Tomcat

[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=41d3b1fd07bf23029a687a21d565cbfe46decde8

The following commit(s) were added to refs/heads/main by this push:
     new 41d3b1f  Support testing Tomcat
41d3b1f is described below

commit 41d3b1fd07bf23029a687a21d565cbfe46decde8
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Feb 22 13:21:36 2022 -0600

    Support testing Tomcat
---
 src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java | 9 +++++++++
 src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 2ea0313..55ca221 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -601,6 +601,10 @@ public abstract class BaseIntegrationTest
      */
     @BeforeClass(enabled = true, dependsOnMethods = {"setUpJettyPaths"})
     public void setUpJettySNI() throws IOException {
+        if (Boolean.getBoolean("tomcat")) {
+            log.debug("Not setting up Jetty WebInfIncludeJarPattern because system property 'tomcat' is true");
+            return;
+        }
         if (jettyVersion.startsWith("9")) {
             return;
         } ;
@@ -949,6 +953,11 @@ public abstract class BaseIntegrationTest
 
     @BeforeClass(enabled = true, dependsOnMethods = {"setUpIdPPaths"})
     public void setUpIdPWebApp() throws Exception {
+        if (Boolean.getBoolean("tomcat")) {
+            log.debug("Not setting up Jetty WebInfIncludeJarPattern because system property 'tomcat' is true");
+            return;
+        }
+
         final Path pathToIdPXML = pathToIdPHome.resolve(Paths.get("jetty-base", "webapps", "idp.xml"));
         Assert.assertTrue(pathToIdPXML.toAbsolutePath().toFile().exists(), "Path to idp.xml not found");
 
diff --git a/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java b/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
index ac797f0..fa2cf41 100644
--- a/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/test/TomcatServerProcess.java
@@ -138,6 +138,13 @@ public class TomcatServerProcess extends AbstractServerProcess {
         } catch (IOException e) {
             log.error("A Telnet I/O error occurred", e);
         }
+
+        // wait half a second for server to shutdown
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            log.error("Unable to sleep", e);
+        }
     }
 
     /** {@inheritDoc} */

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