systemtests: combine reload-* tests into one test

bareos · Sep 20, 2021 · a8aa5c6 · a8aa5c6
1 parent ffa3793
commit a8aa5c6
Show file tree

Hide file tree

Showing 125 changed files with 72 additions and 1,159 deletions.
diff --git a/systemtests/cmake/BareosSystemtestFunctions.cmake b/systemtests/cmake/BareosSystemtestFunctions.cmake
@@ -26,9 +26,6 @@ macro(create_systemtests_directory)
   configurefilestosystemtest("systemtests" "data" "*.gz" COPYONLY "")
 
   configurefilestosystemtest("systemtests" "scripts" "functions" @ONLY "")
-  configurefilestosystemtest(
-    "systemtests" "scripts" "reload_test_functions" @ONLY ""
-  )
   configurefilestosystemtest("systemtests" "scripts" "cleanup" @ONLY "")
   configurefilestosystemtest("systemtests" "scripts" "setup" @ONLY "")
   configurefilestosystemtest("systemtests" "scripts" "start_bareos.sh" @ONLY "")

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
@@ -62,12 +62,7 @@ add_subdirectory(python-bareos)
 add_subdirectory(python-pam)
 add_subdirectory(python-restapi)
 add_subdirectory(quota-softquota)
-add_subdirectory(reload-add-client)
-add_subdirectory(reload-add-duplicate-job)
-add_subdirectory(reload-add-empty-job)
-add_subdirectory(reload-add-second-director)
-add_subdirectory(reload-add-uncommented-string)
-add_subdirectory(reload-unchanged-config)
+add_subdirectory(reload)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)

diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/...emtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/...emtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
diff --git a/...mtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/...mtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/...emtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/...emtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bconsole.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in