From 261d604ea332e4ff5fa14aa8f9745ad222d164fd Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 6 Jul 2025 14:17:42 +0200 Subject: [PATCH] test: minor refactor, relocate "Test done ..." message to setup.sh Signed-off-by: Joachim Wiberg --- test/add-remove-dynamic-service-sub-config.sh | 2 -- test/add-remove-dynamic-service.sh | 2 -- test/bootstrap-crash.sh | 5 ----- test/cond-start-task.sh | 1 - test/crashing.sh | 2 -- test/depserv.sh | 1 - test/devmon.sh | 1 - test/failing-sysv.sh | 2 -- test/global-envs.sh | 2 -- test/initctl-status-subset.sh | 2 -- test/lib/setup.sh | 1 + test/notify.sh | 1 - test/pidfile.sh | 1 - test/pre-post-serv.sh | 2 -- test/process-depends.sh | 1 - test/rclocal.sh | 5 ----- test/ready-serv.sh | 2 -- test/restart-self.sh | 2 -- test/run-restart-forever.sh | 2 -- test/run-task-tricks.sh | 5 ----- test/runlevel.sh | 5 ----- test/runparts.sh | 5 ----- test/signal-service.sh | 2 -- test/start-kill-service.sh | 2 -- test/start-kill-stop.sh | 2 -- test/start-stop-serv.sh | 2 -- test/start-stop-service-sub-config.sh | 2 -- test/start-stop-service.sh | 2 -- test/start-stop-sysv.sh | 1 - test/svc-env.sh | 2 -- test/sysvparts.sh | 5 ----- test/unexpected-restart.sh | 5 ----- 32 files changed, 1 insertion(+), 76 deletions(-) diff --git a/test/add-remove-dynamic-service-sub-config.sh b/test/add-remove-dynamic-service-sub-config.sh index 958dd8fe..6a050f5f 100755 --- a/test/add-remove-dynamic-service-sub-config.sh +++ b/test/add-remove-dynamic-service-sub-config.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_RCSD/service.conf" } diff --git a/test/add-remove-dynamic-service.sh b/test/add-remove-dynamic-service.sh index 159a26bb..290948a7 100755 --- a/test/add-remove-dynamic-service.sh +++ b/test/add-remove-dynamic-service.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/bootstrap-crash.sh b/test/bootstrap-crash.sh index 36c9897f..c9683f65 100755 --- a/test/bootstrap-crash.sh +++ b/test/bootstrap-crash.sh @@ -11,11 +11,6 @@ BOOTSTRAP="run [S] crasher.sh -- Party crasher" # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" -test_teardown() -{ - say "Test done $(date)" -} - say "Hello SMTP Spoken here" run initctl run initctl status crasher.sh diff --git a/test/cond-start-task.sh b/test/cond-start-task.sh index 8a194020..9290dbec 100755 --- a/test/cond-start-task.sh +++ b/test/cond-start-task.sh @@ -9,7 +9,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $TEST_CONF" } diff --git a/test/crashing.sh b/test/crashing.sh index e19cf59c..1322e502 100755 --- a/test/crashing.sh +++ b/test/crashing.sh @@ -7,8 +7,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" "/tmp/post" } diff --git a/test/depserv.sh b/test/depserv.sh index 20c3f61d..2f5c7a3c 100755 --- a/test/depserv.sh +++ b/test/depserv.sh @@ -16,7 +16,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $FINIT_CONF" "/tmp/post" diff --git a/test/devmon.sh b/test/devmon.sh index 9261ee20..7efd2bcf 100755 --- a/test/devmon.sh +++ b/test/devmon.sh @@ -9,7 +9,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $FINIT_CONF /tmp/post" diff --git a/test/failing-sysv.sh b/test/failing-sysv.sh index 11ea4f9f..5e652dab 100755 --- a/test/failing-sysv.sh +++ b/test/failing-sysv.sh @@ -13,8 +13,6 @@ test_setup() test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/global-envs.sh b/test/global-envs.sh index 548afb96..1405b755 100755 --- a/test/global-envs.sh +++ b/test/global-envs.sh @@ -10,8 +10,6 @@ baz=qux" test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/initctl-status-subset.sh b/test/initctl-status-subset.sh index eba86f58..4cb4ff8c 100755 --- a/test/initctl-status-subset.sh +++ b/test/initctl-status-subset.sh @@ -9,8 +9,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/lib/setup.sh b/test/lib/setup.sh index 33bed403..09a57fd1 100755 --- a/test/lib/setup.sh +++ b/test/lib/setup.sh @@ -263,6 +263,7 @@ teardown() { test_status="$?" + echo "Test done $(date)" wdkill if type test_teardown > /dev/null 2>&1 ; then test_teardown diff --git a/test/notify.sh b/test/notify.sh index 0cbe6391..3c13b9e7 100755 --- a/test/notify.sh +++ b/test/notify.sh @@ -13,7 +13,6 @@ test_setup() test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $FINIT_CONF" diff --git a/test/pidfile.sh b/test/pidfile.sh index a2eabdf1..e85f7943 100755 --- a/test/pidfile.sh +++ b/test/pidfile.sh @@ -7,7 +7,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $FINIT_CONF" "/tmp/post" diff --git a/test/pre-post-serv.sh b/test/pre-post-serv.sh index 0b907465..90d99739 100755 --- a/test/pre-post-serv.sh +++ b/test/pre-post-serv.sh @@ -11,8 +11,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/process-depends.sh b/test/process-depends.sh index 1eeebab3..6e0659f4 100755 --- a/test/process-depends.sh +++ b/test/process-depends.sh @@ -13,7 +13,6 @@ test_setup() test_teardown() { - say "Test done $(date)" say "Running test teardown." run "rm -f $FINIT_CONF" diff --git a/test/rclocal.sh b/test/rclocal.sh index d7bc6d3d..ea5162b7 100755 --- a/test/rclocal.sh +++ b/test/rclocal.sh @@ -7,11 +7,6 @@ RCLOCAL="echo 'KILROY WAS HERE' > /tmp/rclocal" TEST_DIR=$(dirname "$0") #DEBUG=1 -test_teardown() -{ - say "Test done $(date)" -} - # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" diff --git a/test/ready-serv.sh b/test/ready-serv.sh index ce91081f..a25d47ae 100755 --- a/test/ready-serv.sh +++ b/test/ready-serv.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/restart-self.sh b/test/restart-self.sh index d8ceb0d9..24cbd1a6 100755 --- a/test/restart-self.sh +++ b/test/restart-self.sh @@ -11,8 +11,6 @@ test_setup() test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/run-restart-forever.sh b/test/run-restart-forever.sh index 9fc28133..892b897b 100755 --- a/test/run-restart-forever.sh +++ b/test/run-restart-forever.sh @@ -15,8 +15,6 @@ test_setup() test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/run-task-tricks.sh b/test/run-task-tricks.sh index f569cc32..43558be6 100755 --- a/test/run-task-tricks.sh +++ b/test/run-task-tricks.sh @@ -21,11 +21,6 @@ run [4] name:four initctl restart service.sh -- Restart service" # shellcheck disable=SC2034 RCLOCAL="echo \"$0 ==============\" &1>2" -test_teardown() -{ - say "Test done $(date)" -} - # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" diff --git a/test/runlevel.sh b/test/runlevel.sh index 22580aae..a2869991 100755 --- a/test/runlevel.sh +++ b/test/runlevel.sh @@ -6,11 +6,6 @@ set -eu TEST_DIR=$(dirname "$0") FINIT_RUNLEVEL=9 -test_teardown() -{ - say "Test done $(date)" -} - # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" diff --git a/test/runparts.sh b/test/runparts.sh index 8bae27b7..a734c297 100755 --- a/test/runparts.sh +++ b/test/runparts.sh @@ -14,11 +14,6 @@ BOOTSTRAP="runparts /etc/rc.d" TEST_DIR=$(dirname "$0") #DEBUG=1 -test_teardown() -{ - say "Test done $(date)" -} - # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" diff --git a/test/signal-service.sh b/test/signal-service.sh index 245ea8da..92be9ee9 100755 --- a/test/signal-service.sh +++ b/test/signal-service.sh @@ -7,8 +7,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/start-kill-service.sh b/test/start-kill-service.sh index 4cad2b92..1fa21780 100755 --- a/test/start-kill-service.sh +++ b/test/start-kill-service.sh @@ -8,8 +8,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/start-kill-stop.sh b/test/start-kill-stop.sh index 2e4f4507..3c99fcdd 100755 --- a/test/start-kill-stop.sh +++ b/test/start-kill-stop.sh @@ -12,8 +12,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { # run "initctl status -j serv" - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/start-stop-serv.sh b/test/start-stop-serv.sh index bc56cf4b..9e4887c7 100755 --- a/test/start-stop-serv.sh +++ b/test/start-stop-serv.sh @@ -5,8 +5,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/start-stop-service-sub-config.sh b/test/start-stop-service-sub-config.sh index 0271f6a4..54bd9d58 100755 --- a/test/start-stop-service-sub-config.sh +++ b/test/start-stop-service-sub-config.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_RCSD/service.conf" } diff --git a/test/start-stop-service.sh b/test/start-stop-service.sh index b854f40b..593e64d5 100755 --- a/test/start-stop-service.sh +++ b/test/start-stop-service.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/start-stop-sysv.sh b/test/start-stop-sysv.sh index 8060fc17..4d4b5724 100755 --- a/test/start-stop-sysv.sh +++ b/test/start-stop-sysv.sh @@ -14,7 +14,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - sep "Test done $(date)" assert "Running test teardown." "run rm -f $FINIT_RCSD/service.conf" } diff --git a/test/svc-env.sh b/test/svc-env.sh index 49f8228d..58885b9f 100755 --- a/test/svc-env.sh +++ b/test/svc-env.sh @@ -6,8 +6,6 @@ TEST_DIR=$(dirname "$0") test_teardown() { - say "Test done $(date)" - say "Running test teardown." run "rm -f $FINIT_CONF" } diff --git a/test/sysvparts.sh b/test/sysvparts.sh index 213d8670..1464d0c7 100755 --- a/test/sysvparts.sh +++ b/test/sysvparts.sh @@ -14,11 +14,6 @@ BOOTSTRAP="runparts sysv /etc/rcS.d" TEST_DIR=$(dirname "$0") DEBUG=1 -test_teardown() -{ - say "Test done $(date)" -} - # shellcheck source=/dev/null . "$TEST_DIR/lib/setup.sh" diff --git a/test/unexpected-restart.sh b/test/unexpected-restart.sh index 51297aad..8994aaa1 100755 --- a/test/unexpected-restart.sh +++ b/test/unexpected-restart.sh @@ -22,11 +22,6 @@ task name:allup initctl cond set EOF } -test_teardown() -{ - say "Test done $(date)" -} - pidof() { texec initctl -j status "$1" | jq .pid