systemtests: remove redundant bareos stops

Since the `end_test` function automatically shuts down bareos when it is a single testrunner, stoping bareos before makes tests try to shutdown bareos twice which may be causing some sporadic errors tls
bareos · Sep 19, 2022 · 2288374 · 2288374
1 parent 48cd7ac
commit 2288374
Show file tree

Hide file tree

Showing 34 changed files with 1 addition and 47 deletions.
diff --git a/systemtests/tests/acl/testrunner b/systemtests/tests/acl/testrunner
@@ -57,7 +57,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

diff --git a/systemtests/tests/bareos-acl/testrunner b/systemtests/tests/bareos-acl/testrunner
@@ -42,6 +42,4 @@ grep -q "status conf: is an invalid command" ${logdir}/acl-status.log || \
 grep -q "eprecated configuration settings detected" ${logdir}/acl-status-conf.log || \
   set_error "acl-status-conf.log"
 
-stop_bareos
-
 end_test
diff --git a/systemtests/tests/bscan-bextract-bls-bcopy/testrunner b/systemtests/tests/bscan-bextract-bls-bcopy/testrunner
@@ -163,8 +163,6 @@ run_bconsole "$tmp/bconcmds2"
 
 check_for_zombie_jobs storage=File
 
-stop_bareos
-
 check_two_logs
 check_restore_diff "${BackupDirectory}"
 end_test
diff --git a/systemtests/tests/chflags/testrunner b/systemtests/tests/chflags/testrunner
@@ -62,7 +62,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

diff --git a/systemtests/tests/client-initiated/testrunner b/systemtests/tests/client-initiated/testrunner
@@ -90,8 +90,6 @@ run_bconsole "$tmp/bconcmds"
 
 check_for_zombie_jobs storage=File
 
-stop_bareos
-
 check_two_logs
 check_restore_diff "${BackupDirectory}"
 end_test
diff --git a/systemtests/tests/copy-archive-job/testrunner b/systemtests/tests/copy-archive-job/testrunner
@@ -58,7 +58,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_sd_files_written $tmp/log2.out
 check_sd_files_written $tmp/log3.out

diff --git a/systemtests/tests/dbcopy-mysql-postgresql/testrunner b/systemtests/tests/dbcopy-mysql-postgresql/testrunner
@@ -80,7 +80,6 @@ END_OF_DATA
 
 run_bareos
 check_for_zombie_jobs storage=File client=bareos-fd
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"

diff --git a/systemtests/tests/droplet-s3/testrunner b/systemtests/tests/droplet-s3/testrunner
@@ -55,7 +55,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"

diff --git a/systemtests/tests/encrypt-signature/testrunner b/systemtests/tests/encrypt-signature/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"

diff --git a/systemtests/tests/filesets/testrunner b/systemtests/tests/filesets/testrunner
@@ -60,7 +60,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 for i in $TESTS; do
     if ! grep -q $tmp/$i/data2.txt $tmp/estimate-$i.out; then

diff --git a/systemtests/tests/gfapi-fd/testrunner b/systemtests/tests/gfapi-fd/testrunner
@@ -136,7 +136,6 @@ quit
 END_OF_DATA_RESTORE
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 ln -s  "${tmp}" "${tmp}/bareos-restores"

diff --git a/systemtests/tests/glusterfs-backend/testrunner b/systemtests/tests/glusterfs-backend/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/list-backups/testrunner b/systemtests/tests/list-backups/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 echo "Checking list backups for jobtype=backup"
 grep -F '1 | backup-bareos-fd | bareos-fd' "$tmp/list-backups.out"

diff --git a/systemtests/tests/multiplied-device/testrunner b/systemtests/tests/multiplied-device/testrunner
@@ -85,7 +85,6 @@ quit
 END_OF_DATA
 
 run_bconsole
-stop_bareos
 
 # rename files to be able to run the test again later
 mv ./etc/bareos/bareos-dir.d/storage/fakestorage1.conf_backup ./etc/bareos/bareos-dir.d/storage/fakestorage1.conf

diff --git a/systemtests/tests/ndmp/testrunner b/systemtests/tests/ndmp/testrunner
@@ -165,6 +165,4 @@ cleanup_isilon
 
 check_for_zombie_jobs storage=isilonfile client=bareos-fd
 
-stop_bareos
-
 end_test
diff --git a/systemtests/tests/notls/testrunner b/systemtests/tests/notls/testrunner
@@ -61,7 +61,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/passive/testrunner b/systemtests/tests/passive/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/pruning/testrunner b/systemtests/tests/pruning/testrunner
@@ -157,7 +157,6 @@ END_OF_DATA
 run_bconsole
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

diff --git a/systemtests/tests/py2plug-dir/testrunner b/systemtests/tests/py2plug-dir/testrunner
@@ -53,7 +53,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 for i in bDirEventJobStart bDirEventJobInit bDirEventJobRun bDirEventJobEnd; do
   if ! grep -q "$i" ${tmp}/test-plugin1.log; then

diff --git a/systemtests/tests/py2plug-fd-libcloud/testrunner b/systemtests/tests/py2plug-fd-libcloud/testrunner
@@ -99,7 +99,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 list=( $(find "${BackupDirectory}" -type f) )

diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
@@ -26,9 +26,6 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
-
-
-
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -62,7 +59,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 list=( $(find "${BackupDirectory}" -type f) )

diff --git a/systemtests/tests/py2plug-fd-local-fileset/testrunner b/systemtests/tests/py2plug-fd-local-fileset/testrunner
@@ -26,9 +26,6 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
-
-
-
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -65,7 +62,6 @@ fi
 check_for_zombie_jobs storage=File
 stop_bareos
 
-
 cat <<END_OF_DATA >$tmp/bconcmds
 @#
 @# now do a restore
@@ -79,7 +75,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/py2plug-fd-mariabackup/testrunner b/systemtests/tests/py2plug-fd-mariabackup/testrunner
@@ -116,7 +116,6 @@ if ! echo "SELECT * from test " | $MYSQL_CLIENT "${mariabackup_test_db}" | grep
 fi
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 mysql_server_stop
 

diff --git a/systemtests/tests/py2plug-fd-ovirt/testrunner.in b/systemtests/tests/py2plug-fd-ovirt/testrunner.in
@@ -50,7 +50,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner b/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
@@ -115,7 +115,6 @@ fi
 
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 mysql_server_stop
 

diff --git a/systemtests/tests/py2plug-fd-vmware/testrunner b/systemtests/tests/py2plug-fd-vmware/testrunner
@@ -65,7 +65,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

diff --git a/systemtests/tests/py2plug-sd/testrunner b/systemtests/tests/py2plug-sd/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 events=(bsdEventJobStart
 bsdEventDeviceReserve

diff --git a/systemtests/tests/spool/testrunner b/systemtests/tests/spool/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/tls-certificate-encryption/CMakeLists.txt b/systemtests/tests/tls-certificate-encryption/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public

diff --git a/systemtests/tests/tls-certificate-encryption/testrunner b/systemtests/tests/tls-certificate-encryption/testrunner
@@ -48,7 +48,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}

diff --git a/systemtests/tests/truncate-command/testrunner b/systemtests/tests/truncate-command/testrunner
@@ -70,9 +70,6 @@ run_bconsole ${tmp}/bconcmds2
 # verify that all are terminated
 check_for_zombie_jobs storage=File1 client=${Client}
 
-# stop bareos
-stop_bareos
-
 # check tmp/log1.out and tmp/log2.out for errors
 check_two_logs
 

diff --git a/systemtests/tests/virtualfull-bscan/testrunner b/systemtests/tests/virtualfull-bscan/testrunner
@@ -128,7 +128,6 @@ END_OF_DATA
 run_bconsole "$tmp/bconcmds2"
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"

diff --git a/systemtests/tests/virtualfull/testrunner b/systemtests/tests/virtualfull/testrunner
@@ -119,7 +119,6 @@ END_OF_DATA
 run_bconsole "$tmp/bconcmds3"
 check_for_zombie_jobs storage=File
 check_two_logs
-stop_bareos
 
 if ! grep -q "Consolidating JobIds 1,2 containing 74 files" "$tmp/log1.out"; then
   echo "Consolidation message was not emitted" >&2

diff --git a/systemtests/tests/xattr/testrunner b/systemtests/tests/xattr/testrunner
@@ -62,7 +62,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs