tests/tomcat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop all user-instance checks

Browse source 
The user-instance package was dropped in:
https://src.fedoraproject.org/rpms/tomcat/c/4a35676781734e27eb64e2ac0ad2cd855c54c986?branch=rawhide
so the tests now always fail because the package doesn't exist.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-09-25 11:53:23 -07:00
commit be6faee881
5 changed files with 1 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

1
directory-structure/main.fmf
View file

@ -1,7 +1,6 @@
summary: Tomcat directory structure test
description: Makes sure that Tomcat home directory has expected structure and that there are no dangling symlinks there.
require+:
- tomcat-user-instance
- tomcat-webapps
- tomcat-admin-webapps
- tomcat-docs-webapp

24
directory-structure/test.sh
View file

@ -28,19 +28,6 @@ rlJournalStart
rlAssertExists ${CATALINA_HOME}/doc/
rlAssertExists ${CATALINA_HOME}/doc/RUNNING.txt
rlAssertExists ${CATALINA_HOME}/lib/
rlAssertExists ${CATALINA_HOME}/user-instance/
rlAssertExists ${CATALINA_HOME}/user-instance/bin/
rlAssertExists ${CATALINA_HOME}/user-instance/bin/setenv.sh
rlAssertExists ${CATALINA_HOME}/user-instance/conf/
rlAssertExists ${CATALINA_HOME}/user-instance/conf/catalina.policy
rlAssertExists ${CATALINA_HOME}/user-instance/conf/catalina.properties
rlAssertExists ${CATALINA_HOME}/user-instance/conf/context.xml
rlAssertExists ${CATALINA_HOME}/user-instance/conf/jaspic-providers.xml
rlAssertExists ${CATALINA_HOME}/user-instance/conf/logging.properties
rlAssertExists ${CATALINA_HOME}/user-instance/conf/server.xml
rlAssertExists ${CATALINA_HOME}/user-instance/conf/tomcat-users.xml
rlAssertExists ${CATALINA_HOME}/user-instance/conf/web.xml
rlPhaseEnd
rlPhaseStartTest "Check CATALINA_BASE directory structure"
@ -71,10 +58,6 @@ rlJournalStart
rlAssertExists /etc/tomcat/conf.d/README
rlPhaseEnd
rlPhaseStartTest "Check user instance script"
rlAssertExists /usr/bin/tomcat-user-instance-create
rlPhaseEnd
rlPhaseStartTest "Check systemd and sysusers"
rlAssertExists /usr/lib/systemd/system/tomcat.service
rlAssertExists /usr/lib/sysusers.d/tomcat.conf
@ -144,14 +127,9 @@ rlJournalStart
rlAssertExists /usr/share/licenses/tomcat-jsp-3.1-api/LICENSE
rlAssertExists /usr/share/licenses/tomcat-servlet-6.0-api/LICENSE
rlAssertExists /usr/share/licenses/tomcat-lib/LICENSE
rlAssertExists /usr/share/licenses/tomcat-user-instance/LICENSE
rlAssertExists /usr/share/licenses/tomcat-webapps/LICENSE
rlPhaseEnd
rlPhaseStartTest "Check user instance man page"
rlAssertExists /usr/share/man/man1/tomcat-user-instance-create.1.gz
rlPhaseEnd
rlPhaseStartTest "Check maven metadata"
rlAssertExists /usr/share/maven-metadata/tomcat.xml
rlAssertExists /usr/share/maven-metadata/tomcat-tomcat-common.xml
@ -204,4 +182,4 @@ rlJournalStart
rlJournalEnd
rlJournalPrintText
rlJournalPrintText

BIN
user-instance-check/jakartahelloworld.war
View file

Binary file not shown.

5
user-instance-check/main.fmf
View file

@ -1,5 +0,0 @@
summary: Tomcat user instance package check
description: Create standalone Tomcat instances with tomcat-user-instance-create. Start Tomcats. Check they are running and serve deployed apps. Stop Tomcats.
require+:
- curl
- tomcat-user-instance

43
user-instance-check/test.sh
View file

@ -1,43 +0,0 @@
#!/bin/bash
# Include Beaker environment
. /usr/share/beakerlib/beakerlib.sh || exit 1
rlJournalStart
rlPhaseStartSetup "Pre-Test Environment Setup"
rlLog "Create tomcat instances"
rlRun "tomcat-user-instance-create tomcatInstance1" 0 "Create tomcatInstance1"
rlRun "tomcat-user-instance-create -p 8081 -c 8006 tomcatInstance2" 0 "Create tomcatInstance2"
rlRun "tomcat-user-instance-create -p 8082 -c 8007 tomcatInstance3" 0 "Create tomcatInstance3"
rlLog "Deploy apps"
rlRun "cp jakartahelloworld.war tomcatInstance1/webapps" 0 "Copying sample webapp to tomcatInstance1"
rlRun "cp jakartahelloworld.war tomcatInstance2/webapps" 0 "Copying sample webapp to tomcatInstance2"
rlRun "cp jakartahelloworld.war tomcatInstance3/webapps" 0 "Copying sample webapp to tomcatInstance3"
rlLog "Start Tomcat instances"
rlRun "tomcatInstance1/bin/startup.sh" 0 "Starting tomcatInstance1"
rlRun "tomcatInstance2/bin/startup.sh" 0 "Starting tomcatInstance2"
rlRun "tomcatInstance3/bin/startup.sh" 0 "Starting tomcatInstance3"
rlPhaseEnd
rlPhaseStartTest "Verify Tomcat instances Functionality"
sleep 10
rlLog "Checking Tomcats via curl"
rlAssertExists tomcatInstance1/webapps/jakartahelloworld
rlAssertExists tomcatInstance2/webapps/jakartahelloworld
rlAssertExists tomcatInstance3/webapps/jakartahelloworld
rlRun "curl http://localhost:8080/jakartahelloworld/hello | grep '<h1>Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance1"
rlRun "curl http://localhost:8081/jakartahelloworld/hello | grep '<h1>Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance2"
rlRun "curl http://localhost:8082/jakartahelloworld/hello | grep '<h1>Hello, World! This is a Jakarta Servlet!'" 0 "Sample servlet of tomcatInstance3"
rlPhaseEnd
rlPhaseStartCleanup "Post-Test Teardown"
rlLog "Stopping Tomcat instances"
rlRun "tomcatInstance1/bin/shutdown.sh" 0 "Stopping tomcatInstance1"
rlRun "tomcatInstance2/bin/shutdown.sh" 0 "Stopping tomcatInstance2"
rlRun "tomcatInstance3/bin/shutdown.sh" 0 "Stopping tomcatInstance3"
rlPhaseEnd
rlJournalEnd
rlJournalPrintText