[shiro] branch main updated: saving payara logs and making it easier to find out why integration test failed

[lprimak]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new faf9220a saving payara logs and making it easier to find out why 
integration test failed
     new 3caff397 Merge pull request #667 from lprimak/jakarta-ee-logging-enh
faf9220a is described below

commit faf9220acfb3af92fd725cf317fe574183007971
Author: lprimak <le...@flowlogix.com>
AuthorDate: Wed Jan 25 17:42:10 2023 -0800

    saving payara logs and making it easier to find out why integration test 
failed
---
 .jenkins.groovy                                               |  1 +
 integration-tests/jakarta-ee/pom.xml                          | 11 -----------
 .../org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java     |  5 +++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.jenkins.groovy b/.jenkins.groovy
index e835481f..0a4f4198 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -98,6 +98,7 @@ pipeline {
                             always {
                                 junit(testResults: 
'**/surefire-reports/*.xml', allowEmptyResults: true)
                                 junit(testResults: 
'**/failsafe-reports/*.xml', allowEmptyResults: true)
+                                archiveArtifacts artifacts: 
'**/logs/server.log*', allowEmptyArchive: true
                             }
                         }
                     }
diff --git a/integration-tests/jakarta-ee/pom.xml 
b/integration-tests/jakarta-ee/pom.xml
index 0fedae9c..da948477 100644
--- a/integration-tests/jakarta-ee/pom.xml
+++ b/integration-tests/jakarta-ee/pom.xml
@@ -427,17 +427,6 @@
                             <goal>exec</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>destroy-domain</id>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <commandlineArgs>delete-domain 
${domain.name}</commandlineArgs>
-                            <skip>${create-domain-skip}</skip>
-                        </configuration>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git 
a/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java
 
b/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java
index 9fe8b784..97625824 100644
--- 
a/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java
+++ 
b/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/ShiroBeansIT.java
@@ -115,9 +115,10 @@ public class ShiroBeansIT {
         assertTrue(messages.getText().startsWith("protected unauth: Attempting 
to perform a user-only operation"),
                 "anonymous user should get an exception");
         webDriver.get(baseURL + "lastException");
-        assertTrue(webDriver.findElement(By.tagName("body")).getText()
+        String exceptionText = 
webDriver.findElement(By.tagName("body")).getText();
+        assertTrue(exceptionText
                 .startsWith(jakartify("WARNING: javax.ejb.EJBException: 
Attempting to perform a user-only operation")),
-                "capturing correct warning from the server");
+                String.format("capturing correct warning from the server: %s", 
exceptionText));
     }
 
     @Test