From a8aa5c695934a8ec80e1c7e9b7a51bb5781fc6a0 Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Tue, 22 Jun 2021 18:19:33 +0200 Subject: [PATCH] systemtests: combine reload-* tests into one test --- .../cmake/BareosSystemtestFunctions.cmake | 3 -- systemtests/tests/CMakeLists.txt | 7 +--- .../bareos-dir.d/catalog/MyCatalog.conf.in | 8 ----- .../bareos-dir.d/client/bareos-fd.conf.in | 7 ---- .../bareos-dir.d/console/bareos-mon.conf.in | 7 ---- .../bareos-dir.d/director/bareos-dir.conf.in | 27 ---------------- .../bareos-dir.d/fileset/Catalog.conf.in | 11 ------- .../bareos-dir.d/fileset/SelfTest.conf.in | 11 ------- .../bareos-dir.d/job/BackupCatalog.conf.in | 20 ------------ .../bareos-dir.d/job/RestoreFiles.conf.in | 11 ------- .../bareos-dir.d/job/backup-bareos-fd.conf | 5 --- .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 15 --------- .../bareos-dir.d/messages/Daemon.conf.in | 7 ---- .../bareos-dir.d/messages/Standard.conf.in | 7 ---- .../bareos-dir.d/pool/Differential.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Full.conf | 10 ------ .../bareos/bareos-dir.d/pool/Incremental.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 4 --- .../bareos/bareos-dir.d/profile/operator.conf | 18 ----------- .../bareos/bareos-dir.d/storage/File.conf.in | 8 ----- .../etc/bareos/bconsole.conf.in | 10 ------ .../bareos-dir.d/catalog/MyCatalog.conf.in | 8 ----- .../bareos-dir.d/client/bareos-fd.conf.in | 7 ---- .../bareos-dir.d/console/bareos-mon.conf.in | 7 ---- .../bareos-dir.d/director/bareos-dir.conf.in | 27 ---------------- .../bareos-dir.d/fileset/Catalog.conf.in | 11 ------- .../bareos-dir.d/fileset/SelfTest.conf.in | 11 ------- .../bareos-dir.d/job/BackupCatalog.conf.in | 20 ------------ .../bareos-dir.d/job/RestoreFiles.conf.in | 11 ------- .../bareos-dir.d/job/backup-bareos-fd.conf | 5 --- .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 15 --------- .../bareos-dir.d/messages/Daemon.conf.in | 7 ---- .../bareos-dir.d/messages/Standard.conf.in | 7 ---- .../bareos-dir.d/pool/Differential.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Full.conf | 10 ------ .../bareos/bareos-dir.d/pool/Incremental.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 4 --- .../bareos/bareos-dir.d/profile/operator.conf | 18 ----------- .../bareos/bareos-dir.d/storage/File.conf.in | 8 ----- .../etc/bareos/bconsole.conf.in | 10 ------ .../bareos-dir.d/catalog/MyCatalog.conf.in | 8 ----- .../bareos-dir.d/client/bareos-fd.conf.in | 7 ---- .../bareos-dir.d/console/bareos-mon.conf.in | 7 ---- .../bareos-dir.d/director/bareos-dir.conf.in | 27 ---------------- .../bareos-dir.d/fileset/Catalog.conf.in | 11 ------- .../bareos-dir.d/fileset/SelfTest.conf.in | 11 ------- .../bareos-dir.d/job/BackupCatalog.conf.in | 20 ------------ .../bareos-dir.d/job/RestoreFiles.conf.in | 11 ------- .../bareos-dir.d/job/backup-bareos-fd.conf | 5 --- .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 15 --------- .../bareos-dir.d/messages/Daemon.conf.in | 7 ---- .../bareos-dir.d/messages/Standard.conf.in | 7 ---- .../bareos-dir.d/pool/Differential.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Full.conf | 10 ------ .../bareos/bareos-dir.d/pool/Incremental.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 4 --- .../bareos/bareos-dir.d/profile/operator.conf | 18 ----------- .../bareos/bareos-dir.d/storage/File.conf.in | 8 ----- .../etc/bareos/bconsole.conf.in | 10 ------ .../bareos-dir.d/catalog/MyCatalog.conf.in | 8 ----- .../bareos-dir.d/client/bareos-fd.conf.in | 7 ---- .../bareos-dir.d/console/bareos-mon.conf.in | 7 ---- .../bareos-dir.d/director/bareos-dir.conf.in | 27 ---------------- .../bareos-dir.d/fileset/Catalog.conf.in | 11 ------- .../bareos-dir.d/fileset/SelfTest.conf.in | 11 ------- .../bareos-dir.d/job/BackupCatalog.conf.in | 20 ------------ .../bareos-dir.d/job/RestoreFiles.conf.in | 11 ------- .../bareos-dir.d/job/backup-bareos-fd.conf | 5 --- .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 15 --------- .../bareos-dir.d/messages/Daemon.conf.in | 7 ---- .../bareos-dir.d/messages/Standard.conf.in | 7 ---- .../bareos-dir.d/pool/Differential.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Full.conf | 10 ------ .../bareos/bareos-dir.d/pool/Incremental.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 4 --- .../bareos/bareos-dir.d/profile/operator.conf | 18 ----------- .../bareos/bareos-dir.d/storage/File.conf.in | 8 ----- .../etc/bareos/bconsole.conf.in | 10 ------ .../bareos-dir.d/catalog/MyCatalog.conf.in | 8 ----- .../bareos-dir.d/client/bareos-fd.conf.in | 7 ---- .../bareos-dir.d/console/bareos-mon.conf.in | 7 ---- .../bareos-dir.d/director/bareos-dir.conf.in | 27 ---------------- .../bareos-dir.d/fileset/Catalog.conf.in | 11 ------- .../bareos-dir.d/fileset/SelfTest.conf.in | 11 ------- .../bareos-dir.d/job/BackupCatalog.conf.in | 20 ------------ .../bareos-dir.d/job/RestoreFiles.conf.in | 11 ------- .../bareos-dir.d/job/backup-bareos-fd.conf | 5 --- .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 15 --------- .../bareos-dir.d/messages/Daemon.conf.in | 7 ---- .../bareos-dir.d/messages/Standard.conf.in | 7 ---- .../bareos-dir.d/pool/Differential.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Full.conf | 10 ------ .../bareos/bareos-dir.d/pool/Incremental.conf | 10 ------ .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 4 --- .../bareos/bareos-dir.d/profile/operator.conf | 18 ----------- .../bareos/bareos-dir.d/storage/File.conf.in | 8 ----- .../etc/bareos/bconsole.conf.in | 10 ------ systemtests/tests/reload/CMakeLists.txt | 2 ++ .../bareos-dir.d/catalog/MyCatalog.conf.in | 0 .../bareos-dir.d/client/bareos-fd.conf.in | 0 .../bareos-dir.d/console/bareos-mon.conf.in | 0 .../bareos-dir.d/director/bareos-dir.conf.in | 0 .../bareos-dir.d/fileset/Catalog.conf.in | 0 .../bareos-dir.d/fileset/SelfTest.conf.in | 0 .../bareos-dir.d/job/BackupCatalog.conf.in | 0 .../bareos-dir.d/job/RestoreFiles.conf.in | 0 .../bareos-dir.d/job/backup-bareos-fd.conf | 0 .../bareos-dir.d/jobdefs/DefaultJob.conf.in | 0 .../bareos-dir.d/messages/Daemon.conf.in | 0 .../bareos-dir.d/messages/Standard.conf.in | 0 .../bareos-dir.d/pool/Differential.conf | 0 .../etc/bareos/bareos-dir.d/pool/Full.conf | 0 .../bareos/bareos-dir.d/pool/Incremental.conf | 0 .../etc/bareos/bareos-dir.d/pool/Scratch.conf | 0 .../bareos/bareos-dir.d/profile/operator.conf | 0 .../bareos/bareos-dir.d/storage/File.conf.in | 0 .../etc/bareos/bconsole.conf.in | 0 .../reload}/reload_test_functions | 6 +++- systemtests/tests/reload/test-setup | 23 +++++++++++++ .../testrunner-add-client} | 32 +++++-------------- .../testrunner-add-duplicate-job} | 24 ++++---------- .../testrunner-add-empty-job} | 27 ++++------------ .../testrunner-add-second-director} | 26 ++++----------- .../testrunner-add-uncommented-string} | 26 ++++----------- .../testrunner-unchanged-config} | 25 ++++----------- 125 files changed, 72 insertions(+), 1159 deletions(-) delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Differential.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Full.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Incremental.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Scratch.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/profile/operator.conf delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/storage/File.conf.in delete mode 100644 systemtests/tests/reload-add-duplicate-job/etc/bareos/bconsole.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Differential.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Full.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Incremental.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Scratch.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/profile/operator.conf delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/storage/File.conf.in delete mode 100644 systemtests/tests/reload-add-empty-job/etc/bareos/bconsole.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Daemon.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Standard.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Differential.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Full.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Incremental.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Scratch.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/profile/operator.conf delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/storage/File.conf.in delete mode 100644 systemtests/tests/reload-add-second-director/etc/bareos/bconsole.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Daemon.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Standard.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Differential.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Full.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Incremental.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Scratch.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/profile/operator.conf delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/storage/File.conf.in delete mode 100644 systemtests/tests/reload-add-uncommented-string/etc/bareos/bconsole.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Daemon.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Standard.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Differential.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Full.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Incremental.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Scratch.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/profile/operator.conf delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/storage/File.conf.in delete mode 100644 systemtests/tests/reload-unchanged-config/etc/bareos/bconsole.conf.in create mode 100644 systemtests/tests/reload/CMakeLists.txt rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/pool/Full.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/profile/operator.conf (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%) rename systemtests/tests/{reload-add-client => reload}/etc/bareos/bconsole.conf.in (100%) rename systemtests/{scripts => tests/reload}/reload_test_functions (96%) create mode 100755 systemtests/tests/reload/test-setup rename systemtests/tests/{reload-add-client/testrunner => reload/testrunner-add-client} (67%) rename systemtests/tests/{reload-add-duplicate-job/testrunner => reload/testrunner-add-duplicate-job} (76%) rename systemtests/tests/{reload-add-empty-job/testrunner => reload/testrunner-add-empty-job} (70%) rename systemtests/tests/{reload-add-second-director/testrunner => reload/testrunner-add-second-director} (73%) rename systemtests/tests/{reload-add-uncommented-string/testrunner => reload/testrunner-add-uncommented-string} (74%) rename systemtests/tests/{reload-unchanged-config/testrunner => reload/testrunner-unchanged-config} (65%) diff --git a/systemtests/cmake/BareosSystemtestFunctions.cmake b/systemtests/cmake/BareosSystemtestFunctions.cmake index 7fe1a00456b..90f370f4634 100644 --- 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 index 010aefd231f..c3b759bbe96 100644 --- 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 deleted file mode 100644 index 479bc6fecbb..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Catalog { - Name = MyCatalog - #dbdriver = "@DEFAULT_DB_TYPE@" - dbdriver = "XXX_REPLACE_WITH_DATABASE_DRIVER_XXX" - dbname = "@db_name@" - dbuser = "@db_user@" - dbpassword = "@db_password@" -} 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 deleted file mode 100644 index 59b61700966..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Client { - Name = bareos-fd - Description = "Client resource of the Director itself." - Address = @hostname@ - Password = "@fd_password@" # password for FileDaemon - FD PORT = @fd_port@ -} diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in deleted file mode 100644 index d276adcb87d..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Console { - Name = bareos-mon - Description = "Restricted console used by tray-monitor to get the status of the director." - Password = "@mon_dir_password@" - CommandACL = status, .status - JobACL = *all* -} diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in deleted file mode 100644 index 33b3a426e3a..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in +++ /dev/null @@ -1,27 +0,0 @@ -Director { # define myself - Name = bareos-dir - QueryFile = "@scriptdir@/query.sql" - Maximum Concurrent Jobs = 10 - Password = "@dir_password@" # Console password - Messages = Daemon - Auditing = yes - - # Enable the Heartbeat if you experience connection losses - # (eg. because of your router or firewall configuration). - # Additionally the Heartbeat can be enabled in bareos-sd and bareos-fd. - # - # Heartbeat Interval = 1 min - - # remove comment in next line to load dynamic backends from specified directory - Backend Directory = @backenddir@ - - # remove comment from "Plugin Directory" to load plugins from specified directory. - # if "Plugin Names" is defined, only the specified plugins will be loaded, - # otherwise all director plugins (*-dir.so) from the "Plugin Directory". - # - # Plugin Directory = "@python_plugin_module_src_dir@" - # Plugin Names = "" - Working Directory = "@working_dir@" - Pid Directory = "@piddir@" - DirPort = @dir_port@ -} 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 deleted file mode 100644 index c7cdc433fe1..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "Catalog" - Description = "Backup the catalog dump and Bareos configuration files." - Include { - Options { - signature = MD5 - } - File = "@working_dir@/@db_name@.sql" # database dump - File = "@confdir@" # configuration - } -} 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 deleted file mode 100644 index ba39719ea3f..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "SelfTest" - Description = "fileset just to backup some files for selftest" - Include { - Options { - Signature = MD5 # calculate md5 checksum per file - } - #File = "@sbindir@" - File=<@tmpdir@/file-list - } -} 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 deleted file mode 100644 index 1da2a7af657..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -Job { - Name = "BackupCatalog" - Description = "Backup the catalog database (after the nightly save)" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - - # This creates an ASCII copy of the catalog - # Arguments to make_catalog_backup.pl are: - # make_catalog_backup.pl - RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog" - - # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" - - # This sends the bootstrap via mail for disaster recovery. - # Should be sent to another system, please change recipient accordingly - Write Bootstrap = "|@bindir@/bsmtp -h @smtp_host@ -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" @job_email@" # (#01) - Priority = 11 # run after main backup -} 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 deleted file mode 100644 index 89256864d9a..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -Job { - Name = "RestoreFiles" - Description = "Standard Restore template. Only one such job is needed for all standard Jobs/Clients/Storage ..." - Type = Restore - Client = bareos-fd - FileSet = SelfTest - Storage = File - Pool = Incremental - Messages = Standard - Where = @tmp@/bareos-restores -} 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 deleted file mode 100644 index ca1891f9620..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf +++ /dev/null @@ -1,5 +0,0 @@ -Job { - Name = "backup-bareos-fd" - JobDefs = "DefaultJob" - Client = "bareos-fd" -} diff --git a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in deleted file mode 100644 index 563126477c9..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = bareos-fd - FileSet = "SelfTest" - Storage = File - Messages = Standard - Pool = Incremental - Priority = 10 - Write Bootstrap = "@working_dir@/%c.bsr" - Full Backup Pool = Full # write Full Backups into "Full" Pool - Differential Backup Pool = Differential # write Diff Backups into "Differential" Pool - Incremental Backup Pool = Incremental # write Incr Backups into "Incremental" Pool -} 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 deleted file mode 100644 index cf6a8cfa1e2..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Daemon - Description = "Message delivery for daemon messages (no job)." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !audit - append = "@logdir@/bareos-audit.log" = audit -} 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 deleted file mode 100644 index b3556ba8c23..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Standard - Description = "Reasonable message delivery -- send most everything to email address and to the console." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit - catalog = all, !skipped, !saved, !audit -} 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 deleted file mode 100644 index 25ce24821ab..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Differential.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Differential - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 90 days # How long should the Differential Backups be kept? (#09) - Maximum Volume Bytes = 10G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Differential-" # Volumes will be labeled "Differential-" -} 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 deleted file mode 100644 index 867fc66b483..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Full.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Full - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365 days # How long should the Full Backups be kept? (#06) - Maximum Volume Bytes = 50G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Full-" # Volumes will be labeled "Full-" -} 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 deleted file mode 100644 index f4dbbab6650..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Incremental.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Incremental - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 30 days # How long should the Incremental Backups be kept? (#12) - Maximum Volume Bytes = 1G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Incremental-" # Volumes will be labeled "Incremental-" -} 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 deleted file mode 100644 index 3a489b19871..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/pool/Scratch.conf +++ /dev/null @@ -1,4 +0,0 @@ -Pool { - Name = Scratch - Pool Type = Scratch -} 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 deleted file mode 100644 index 6edd0166dca..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/profile/operator.conf +++ /dev/null @@ -1,18 +0,0 @@ -Profile { - Name = operator - Description = "Profile allowing normal Bareos operations." - - Command ACL = !.bvfs_clear_cache, !.exit, !.sql - Command ACL = !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount - Command ACL = *all* - - Catalog ACL = *all* - Client ACL = *all* - FileSet ACL = *all* - Job ACL = *all* - Plugin Options ACL = *all* - Pool ACL = *all* - Schedule ACL = *all* - Storage ACL = *all* - Where ACL = *all* -} 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 deleted file mode 100644 index a2622f719e2..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bareos-dir.d/storage/File.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Storage { - Name = File - Address = @hostname@ - Password = "@sd_password@" - Device = FileStorage - Media Type = File - SD Port = @sd_port@ -} 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 deleted file mode 100644 index 50b647c1d71..00000000000 --- a/systemtests/tests/reload-add-duplicate-job/etc/bareos/bconsole.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bareos User Agent (or Console) Configuration File -# - -Director { - Name = @basename@-dir - DIRport = @dir_port@ - Address = @hostname@ - Password = "@dir_password@" -} 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 deleted file mode 100644 index 479bc6fecbb..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Catalog { - Name = MyCatalog - #dbdriver = "@DEFAULT_DB_TYPE@" - dbdriver = "XXX_REPLACE_WITH_DATABASE_DRIVER_XXX" - dbname = "@db_name@" - dbuser = "@db_user@" - dbpassword = "@db_password@" -} 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 deleted file mode 100644 index 59b61700966..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Client { - Name = bareos-fd - Description = "Client resource of the Director itself." - Address = @hostname@ - Password = "@fd_password@" # password for FileDaemon - FD PORT = @fd_port@ -} 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 deleted file mode 100644 index d276adcb87d..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Console { - Name = bareos-mon - Description = "Restricted console used by tray-monitor to get the status of the director." - Password = "@mon_dir_password@" - CommandACL = status, .status - JobACL = *all* -} 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 deleted file mode 100644 index 33b3a426e3a..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in +++ /dev/null @@ -1,27 +0,0 @@ -Director { # define myself - Name = bareos-dir - QueryFile = "@scriptdir@/query.sql" - Maximum Concurrent Jobs = 10 - Password = "@dir_password@" # Console password - Messages = Daemon - Auditing = yes - - # Enable the Heartbeat if you experience connection losses - # (eg. because of your router or firewall configuration). - # Additionally the Heartbeat can be enabled in bareos-sd and bareos-fd. - # - # Heartbeat Interval = 1 min - - # remove comment in next line to load dynamic backends from specified directory - Backend Directory = @backenddir@ - - # remove comment from "Plugin Directory" to load plugins from specified directory. - # if "Plugin Names" is defined, only the specified plugins will be loaded, - # otherwise all director plugins (*-dir.so) from the "Plugin Directory". - # - # Plugin Directory = "@python_plugin_module_src_dir@" - # Plugin Names = "" - Working Directory = "@working_dir@" - Pid Directory = "@piddir@" - DirPort = @dir_port@ -} 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 deleted file mode 100644 index c7cdc433fe1..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "Catalog" - Description = "Backup the catalog dump and Bareos configuration files." - Include { - Options { - signature = MD5 - } - File = "@working_dir@/@db_name@.sql" # database dump - File = "@confdir@" # configuration - } -} 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 deleted file mode 100644 index ba39719ea3f..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "SelfTest" - Description = "fileset just to backup some files for selftest" - Include { - Options { - Signature = MD5 # calculate md5 checksum per file - } - #File = "@sbindir@" - File=<@tmpdir@/file-list - } -} 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 deleted file mode 100644 index 1da2a7af657..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -Job { - Name = "BackupCatalog" - Description = "Backup the catalog database (after the nightly save)" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - - # This creates an ASCII copy of the catalog - # Arguments to make_catalog_backup.pl are: - # make_catalog_backup.pl - RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog" - - # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" - - # This sends the bootstrap via mail for disaster recovery. - # Should be sent to another system, please change recipient accordingly - Write Bootstrap = "|@bindir@/bsmtp -h @smtp_host@ -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" @job_email@" # (#01) - Priority = 11 # run after main backup -} 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 deleted file mode 100644 index 89256864d9a..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -Job { - Name = "RestoreFiles" - Description = "Standard Restore template. Only one such job is needed for all standard Jobs/Clients/Storage ..." - Type = Restore - Client = bareos-fd - FileSet = SelfTest - Storage = File - Pool = Incremental - Messages = Standard - Where = @tmp@/bareos-restores -} 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 deleted file mode 100644 index ca1891f9620..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf +++ /dev/null @@ -1,5 +0,0 @@ -Job { - Name = "backup-bareos-fd" - JobDefs = "DefaultJob" - Client = "bareos-fd" -} 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 deleted file mode 100644 index 563126477c9..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = bareos-fd - FileSet = "SelfTest" - Storage = File - Messages = Standard - Pool = Incremental - Priority = 10 - Write Bootstrap = "@working_dir@/%c.bsr" - Full Backup Pool = Full # write Full Backups into "Full" Pool - Differential Backup Pool = Differential # write Diff Backups into "Differential" Pool - Incremental Backup Pool = Incremental # write Incr Backups into "Incremental" Pool -} 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 deleted file mode 100644 index cf6a8cfa1e2..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Daemon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Daemon - Description = "Message delivery for daemon messages (no job)." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !audit - append = "@logdir@/bareos-audit.log" = audit -} 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 deleted file mode 100644 index b3556ba8c23..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/messages/Standard.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Standard - Description = "Reasonable message delivery -- send most everything to email address and to the console." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit - catalog = all, !skipped, !saved, !audit -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Differential.conf deleted file mode 100644 index 25ce24821ab..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Differential.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Differential - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 90 days # How long should the Differential Backups be kept? (#09) - Maximum Volume Bytes = 10G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Differential-" # Volumes will be labeled "Differential-" -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Full.conf deleted file mode 100644 index 867fc66b483..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Full.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Full - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365 days # How long should the Full Backups be kept? (#06) - Maximum Volume Bytes = 50G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Full-" # Volumes will be labeled "Full-" -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Incremental.conf deleted file mode 100644 index f4dbbab6650..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Incremental.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Incremental - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 30 days # How long should the Incremental Backups be kept? (#12) - Maximum Volume Bytes = 1G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Incremental-" # Volumes will be labeled "Incremental-" -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Scratch.conf deleted file mode 100644 index 3a489b19871..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/pool/Scratch.conf +++ /dev/null @@ -1,4 +0,0 @@ -Pool { - Name = Scratch - Pool Type = Scratch -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/profile/operator.conf deleted file mode 100644 index 6edd0166dca..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/profile/operator.conf +++ /dev/null @@ -1,18 +0,0 @@ -Profile { - Name = operator - Description = "Profile allowing normal Bareos operations." - - Command ACL = !.bvfs_clear_cache, !.exit, !.sql - Command ACL = !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount - Command ACL = *all* - - Catalog ACL = *all* - Client ACL = *all* - FileSet ACL = *all* - Job ACL = *all* - Plugin Options ACL = *all* - Pool ACL = *all* - Schedule ACL = *all* - Storage ACL = *all* - Where ACL = *all* -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/storage/File.conf.in deleted file mode 100644 index a2622f719e2..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bareos-dir.d/storage/File.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Storage { - Name = File - Address = @hostname@ - Password = "@sd_password@" - Device = FileStorage - Media Type = File - SD Port = @sd_port@ -} diff --git a/systemtests/tests/reload-add-empty-job/etc/bareos/bconsole.conf.in b/systemtests/tests/reload-add-empty-job/etc/bareos/bconsole.conf.in deleted file mode 100644 index 50b647c1d71..00000000000 --- a/systemtests/tests/reload-add-empty-job/etc/bareos/bconsole.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bareos User Agent (or Console) Configuration File -# - -Director { - Name = @basename@-dir - DIRport = @dir_port@ - Address = @hostname@ - Password = "@dir_password@" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in deleted file mode 100644 index 479bc6fecbb..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Catalog { - Name = MyCatalog - #dbdriver = "@DEFAULT_DB_TYPE@" - dbdriver = "XXX_REPLACE_WITH_DATABASE_DRIVER_XXX" - dbname = "@db_name@" - dbuser = "@db_user@" - dbpassword = "@db_password@" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in deleted file mode 100644 index 59b61700966..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Client { - Name = bareos-fd - Description = "Client resource of the Director itself." - Address = @hostname@ - Password = "@fd_password@" # password for FileDaemon - FD PORT = @fd_port@ -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in deleted file mode 100644 index d276adcb87d..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Console { - Name = bareos-mon - Description = "Restricted console used by tray-monitor to get the status of the director." - Password = "@mon_dir_password@" - CommandACL = status, .status - JobACL = *all* -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in deleted file mode 100644 index 33b3a426e3a..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in +++ /dev/null @@ -1,27 +0,0 @@ -Director { # define myself - Name = bareos-dir - QueryFile = "@scriptdir@/query.sql" - Maximum Concurrent Jobs = 10 - Password = "@dir_password@" # Console password - Messages = Daemon - Auditing = yes - - # Enable the Heartbeat if you experience connection losses - # (eg. because of your router or firewall configuration). - # Additionally the Heartbeat can be enabled in bareos-sd and bareos-fd. - # - # Heartbeat Interval = 1 min - - # remove comment in next line to load dynamic backends from specified directory - Backend Directory = @backenddir@ - - # remove comment from "Plugin Directory" to load plugins from specified directory. - # if "Plugin Names" is defined, only the specified plugins will be loaded, - # otherwise all director plugins (*-dir.so) from the "Plugin Directory". - # - # Plugin Directory = "@python_plugin_module_src_dir@" - # Plugin Names = "" - Working Directory = "@working_dir@" - Pid Directory = "@piddir@" - DirPort = @dir_port@ -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in deleted file mode 100644 index c7cdc433fe1..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "Catalog" - Description = "Backup the catalog dump and Bareos configuration files." - Include { - Options { - signature = MD5 - } - File = "@working_dir@/@db_name@.sql" # database dump - File = "@confdir@" # configuration - } -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in deleted file mode 100644 index ba39719ea3f..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "SelfTest" - Description = "fileset just to backup some files for selftest" - Include { - Options { - Signature = MD5 # calculate md5 checksum per file - } - #File = "@sbindir@" - File=<@tmpdir@/file-list - } -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in deleted file mode 100644 index 1da2a7af657..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -Job { - Name = "BackupCatalog" - Description = "Backup the catalog database (after the nightly save)" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - - # This creates an ASCII copy of the catalog - # Arguments to make_catalog_backup.pl are: - # make_catalog_backup.pl - RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog" - - # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" - - # This sends the bootstrap via mail for disaster recovery. - # Should be sent to another system, please change recipient accordingly - Write Bootstrap = "|@bindir@/bsmtp -h @smtp_host@ -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" @job_email@" # (#01) - Priority = 11 # run after main backup -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in deleted file mode 100644 index 89256864d9a..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -Job { - Name = "RestoreFiles" - Description = "Standard Restore template. Only one such job is needed for all standard Jobs/Clients/Storage ..." - Type = Restore - Client = bareos-fd - FileSet = SelfTest - Storage = File - Pool = Incremental - Messages = Standard - Where = @tmp@/bareos-restores -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf deleted file mode 100644 index ca1891f9620..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf +++ /dev/null @@ -1,5 +0,0 @@ -Job { - Name = "backup-bareos-fd" - JobDefs = "DefaultJob" - Client = "bareos-fd" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in deleted file mode 100644 index 563126477c9..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = bareos-fd - FileSet = "SelfTest" - Storage = File - Messages = Standard - Pool = Incremental - Priority = 10 - Write Bootstrap = "@working_dir@/%c.bsr" - Full Backup Pool = Full # write Full Backups into "Full" Pool - Differential Backup Pool = Differential # write Diff Backups into "Differential" Pool - Incremental Backup Pool = Incremental # write Incr Backups into "Incremental" Pool -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Daemon.conf.in deleted file mode 100644 index cf6a8cfa1e2..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Daemon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Daemon - Description = "Message delivery for daemon messages (no job)." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !audit - append = "@logdir@/bareos-audit.log" = audit -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Standard.conf.in deleted file mode 100644 index b3556ba8c23..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/messages/Standard.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Standard - Description = "Reasonable message delivery -- send most everything to email address and to the console." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit - catalog = all, !skipped, !saved, !audit -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Differential.conf deleted file mode 100644 index 25ce24821ab..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Differential.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Differential - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 90 days # How long should the Differential Backups be kept? (#09) - Maximum Volume Bytes = 10G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Differential-" # Volumes will be labeled "Differential-" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Full.conf deleted file mode 100644 index 867fc66b483..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Full.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Full - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365 days # How long should the Full Backups be kept? (#06) - Maximum Volume Bytes = 50G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Full-" # Volumes will be labeled "Full-" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Incremental.conf deleted file mode 100644 index f4dbbab6650..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Incremental.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Incremental - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 30 days # How long should the Incremental Backups be kept? (#12) - Maximum Volume Bytes = 1G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Incremental-" # Volumes will be labeled "Incremental-" -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Scratch.conf deleted file mode 100644 index 3a489b19871..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/pool/Scratch.conf +++ /dev/null @@ -1,4 +0,0 @@ -Pool { - Name = Scratch - Pool Type = Scratch -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/profile/operator.conf deleted file mode 100644 index 6edd0166dca..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/profile/operator.conf +++ /dev/null @@ -1,18 +0,0 @@ -Profile { - Name = operator - Description = "Profile allowing normal Bareos operations." - - Command ACL = !.bvfs_clear_cache, !.exit, !.sql - Command ACL = !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount - Command ACL = *all* - - Catalog ACL = *all* - Client ACL = *all* - FileSet ACL = *all* - Job ACL = *all* - Plugin Options ACL = *all* - Pool ACL = *all* - Schedule ACL = *all* - Storage ACL = *all* - Where ACL = *all* -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/storage/File.conf.in deleted file mode 100644 index a2622f719e2..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bareos-dir.d/storage/File.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Storage { - Name = File - Address = @hostname@ - Password = "@sd_password@" - Device = FileStorage - Media Type = File - SD Port = @sd_port@ -} diff --git a/systemtests/tests/reload-add-second-director/etc/bareos/bconsole.conf.in b/systemtests/tests/reload-add-second-director/etc/bareos/bconsole.conf.in deleted file mode 100644 index 50b647c1d71..00000000000 --- a/systemtests/tests/reload-add-second-director/etc/bareos/bconsole.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bareos User Agent (or Console) Configuration File -# - -Director { - Name = @basename@-dir - DIRport = @dir_port@ - Address = @hostname@ - Password = "@dir_password@" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in deleted file mode 100644 index 479bc6fecbb..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Catalog { - Name = MyCatalog - #dbdriver = "@DEFAULT_DB_TYPE@" - dbdriver = "XXX_REPLACE_WITH_DATABASE_DRIVER_XXX" - dbname = "@db_name@" - dbuser = "@db_user@" - dbpassword = "@db_password@" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in deleted file mode 100644 index 59b61700966..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Client { - Name = bareos-fd - Description = "Client resource of the Director itself." - Address = @hostname@ - Password = "@fd_password@" # password for FileDaemon - FD PORT = @fd_port@ -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in deleted file mode 100644 index d276adcb87d..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Console { - Name = bareos-mon - Description = "Restricted console used by tray-monitor to get the status of the director." - Password = "@mon_dir_password@" - CommandACL = status, .status - JobACL = *all* -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in deleted file mode 100644 index 33b3a426e3a..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in +++ /dev/null @@ -1,27 +0,0 @@ -Director { # define myself - Name = bareos-dir - QueryFile = "@scriptdir@/query.sql" - Maximum Concurrent Jobs = 10 - Password = "@dir_password@" # Console password - Messages = Daemon - Auditing = yes - - # Enable the Heartbeat if you experience connection losses - # (eg. because of your router or firewall configuration). - # Additionally the Heartbeat can be enabled in bareos-sd and bareos-fd. - # - # Heartbeat Interval = 1 min - - # remove comment in next line to load dynamic backends from specified directory - Backend Directory = @backenddir@ - - # remove comment from "Plugin Directory" to load plugins from specified directory. - # if "Plugin Names" is defined, only the specified plugins will be loaded, - # otherwise all director plugins (*-dir.so) from the "Plugin Directory". - # - # Plugin Directory = "@python_plugin_module_src_dir@" - # Plugin Names = "" - Working Directory = "@working_dir@" - Pid Directory = "@piddir@" - DirPort = @dir_port@ -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in deleted file mode 100644 index c7cdc433fe1..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "Catalog" - Description = "Backup the catalog dump and Bareos configuration files." - Include { - Options { - signature = MD5 - } - File = "@working_dir@/@db_name@.sql" # database dump - File = "@confdir@" # configuration - } -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in deleted file mode 100644 index ba39719ea3f..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "SelfTest" - Description = "fileset just to backup some files for selftest" - Include { - Options { - Signature = MD5 # calculate md5 checksum per file - } - #File = "@sbindir@" - File=<@tmpdir@/file-list - } -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in deleted file mode 100644 index 1da2a7af657..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -Job { - Name = "BackupCatalog" - Description = "Backup the catalog database (after the nightly save)" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - - # This creates an ASCII copy of the catalog - # Arguments to make_catalog_backup.pl are: - # make_catalog_backup.pl - RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog" - - # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" - - # This sends the bootstrap via mail for disaster recovery. - # Should be sent to another system, please change recipient accordingly - Write Bootstrap = "|@bindir@/bsmtp -h @smtp_host@ -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" @job_email@" # (#01) - Priority = 11 # run after main backup -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in deleted file mode 100644 index 89256864d9a..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -Job { - Name = "RestoreFiles" - Description = "Standard Restore template. Only one such job is needed for all standard Jobs/Clients/Storage ..." - Type = Restore - Client = bareos-fd - FileSet = SelfTest - Storage = File - Pool = Incremental - Messages = Standard - Where = @tmp@/bareos-restores -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf deleted file mode 100644 index ca1891f9620..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf +++ /dev/null @@ -1,5 +0,0 @@ -Job { - Name = "backup-bareos-fd" - JobDefs = "DefaultJob" - Client = "bareos-fd" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in deleted file mode 100644 index 563126477c9..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = bareos-fd - FileSet = "SelfTest" - Storage = File - Messages = Standard - Pool = Incremental - Priority = 10 - Write Bootstrap = "@working_dir@/%c.bsr" - Full Backup Pool = Full # write Full Backups into "Full" Pool - Differential Backup Pool = Differential # write Diff Backups into "Differential" Pool - Incremental Backup Pool = Incremental # write Incr Backups into "Incremental" Pool -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Daemon.conf.in deleted file mode 100644 index cf6a8cfa1e2..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Daemon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Daemon - Description = "Message delivery for daemon messages (no job)." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !audit - append = "@logdir@/bareos-audit.log" = audit -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Standard.conf.in deleted file mode 100644 index b3556ba8c23..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/messages/Standard.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Standard - Description = "Reasonable message delivery -- send most everything to email address and to the console." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit - catalog = all, !skipped, !saved, !audit -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Differential.conf deleted file mode 100644 index 25ce24821ab..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Differential.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Differential - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 90 days # How long should the Differential Backups be kept? (#09) - Maximum Volume Bytes = 10G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Differential-" # Volumes will be labeled "Differential-" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Full.conf deleted file mode 100644 index 867fc66b483..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Full.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Full - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365 days # How long should the Full Backups be kept? (#06) - Maximum Volume Bytes = 50G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Full-" # Volumes will be labeled "Full-" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Incremental.conf deleted file mode 100644 index f4dbbab6650..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Incremental.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Incremental - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 30 days # How long should the Incremental Backups be kept? (#12) - Maximum Volume Bytes = 1G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Incremental-" # Volumes will be labeled "Incremental-" -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Scratch.conf deleted file mode 100644 index 3a489b19871..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/pool/Scratch.conf +++ /dev/null @@ -1,4 +0,0 @@ -Pool { - Name = Scratch - Pool Type = Scratch -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/profile/operator.conf deleted file mode 100644 index 6edd0166dca..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/profile/operator.conf +++ /dev/null @@ -1,18 +0,0 @@ -Profile { - Name = operator - Description = "Profile allowing normal Bareos operations." - - Command ACL = !.bvfs_clear_cache, !.exit, !.sql - Command ACL = !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount - Command ACL = *all* - - Catalog ACL = *all* - Client ACL = *all* - FileSet ACL = *all* - Job ACL = *all* - Plugin Options ACL = *all* - Pool ACL = *all* - Schedule ACL = *all* - Storage ACL = *all* - Where ACL = *all* -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/storage/File.conf.in deleted file mode 100644 index a2622f719e2..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bareos-dir.d/storage/File.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Storage { - Name = File - Address = @hostname@ - Password = "@sd_password@" - Device = FileStorage - Media Type = File - SD Port = @sd_port@ -} diff --git a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bconsole.conf.in b/systemtests/tests/reload-add-uncommented-string/etc/bareos/bconsole.conf.in deleted file mode 100644 index 50b647c1d71..00000000000 --- a/systemtests/tests/reload-add-uncommented-string/etc/bareos/bconsole.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bareos User Agent (or Console) Configuration File -# - -Director { - Name = @basename@-dir - DIRport = @dir_port@ - Address = @hostname@ - Password = "@dir_password@" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in deleted file mode 100644 index 479bc6fecbb..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Catalog { - Name = MyCatalog - #dbdriver = "@DEFAULT_DB_TYPE@" - dbdriver = "XXX_REPLACE_WITH_DATABASE_DRIVER_XXX" - dbname = "@db_name@" - dbuser = "@db_user@" - dbpassword = "@db_password@" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in deleted file mode 100644 index 59b61700966..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Client { - Name = bareos-fd - Description = "Client resource of the Director itself." - Address = @hostname@ - Password = "@fd_password@" # password for FileDaemon - FD PORT = @fd_port@ -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in deleted file mode 100644 index d276adcb87d..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Console { - Name = bareos-mon - Description = "Restricted console used by tray-monitor to get the status of the director." - Password = "@mon_dir_password@" - CommandACL = status, .status - JobACL = *all* -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in deleted file mode 100644 index 33b3a426e3a..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in +++ /dev/null @@ -1,27 +0,0 @@ -Director { # define myself - Name = bareos-dir - QueryFile = "@scriptdir@/query.sql" - Maximum Concurrent Jobs = 10 - Password = "@dir_password@" # Console password - Messages = Daemon - Auditing = yes - - # Enable the Heartbeat if you experience connection losses - # (eg. because of your router or firewall configuration). - # Additionally the Heartbeat can be enabled in bareos-sd and bareos-fd. - # - # Heartbeat Interval = 1 min - - # remove comment in next line to load dynamic backends from specified directory - Backend Directory = @backenddir@ - - # remove comment from "Plugin Directory" to load plugins from specified directory. - # if "Plugin Names" is defined, only the specified plugins will be loaded, - # otherwise all director plugins (*-dir.so) from the "Plugin Directory". - # - # Plugin Directory = "@python_plugin_module_src_dir@" - # Plugin Names = "" - Working Directory = "@working_dir@" - Pid Directory = "@piddir@" - DirPort = @dir_port@ -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in deleted file mode 100644 index c7cdc433fe1..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "Catalog" - Description = "Backup the catalog dump and Bareos configuration files." - Include { - Options { - signature = MD5 - } - File = "@working_dir@/@db_name@.sql" # database dump - File = "@confdir@" # configuration - } -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in deleted file mode 100644 index ba39719ea3f..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -FileSet { - Name = "SelfTest" - Description = "fileset just to backup some files for selftest" - Include { - Options { - Signature = MD5 # calculate md5 checksum per file - } - #File = "@sbindir@" - File=<@tmpdir@/file-list - } -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in deleted file mode 100644 index 1da2a7af657..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -Job { - Name = "BackupCatalog" - Description = "Backup the catalog database (after the nightly save)" - JobDefs = "DefaultJob" - Level = Full - FileSet="Catalog" - - # This creates an ASCII copy of the catalog - # Arguments to make_catalog_backup.pl are: - # make_catalog_backup.pl - RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog" - - # This deletes the copy of the catalog - RunAfterJob = "@scriptdir@/delete_catalog_backup" - - # This sends the bootstrap via mail for disaster recovery. - # Should be sent to another system, please change recipient accordingly - Write Bootstrap = "|@bindir@/bsmtp -h @smtp_host@ -f \"\(Bareos\) \" -s \"Bootstrap for Job %j\" @job_email@" # (#01) - Priority = 11 # run after main backup -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in deleted file mode 100644 index 89256864d9a..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in +++ /dev/null @@ -1,11 +0,0 @@ -Job { - Name = "RestoreFiles" - Description = "Standard Restore template. Only one such job is needed for all standard Jobs/Clients/Storage ..." - Type = Restore - Client = bareos-fd - FileSet = SelfTest - Storage = File - Pool = Incremental - Messages = Standard - Where = @tmp@/bareos-restores -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf deleted file mode 100644 index ca1891f9620..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf +++ /dev/null @@ -1,5 +0,0 @@ -Job { - Name = "backup-bareos-fd" - JobDefs = "DefaultJob" - Client = "bareos-fd" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in deleted file mode 100644 index 563126477c9..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -JobDefs { - Name = "DefaultJob" - Type = Backup - Level = Incremental - Client = bareos-fd - FileSet = "SelfTest" - Storage = File - Messages = Standard - Pool = Incremental - Priority = 10 - Write Bootstrap = "@working_dir@/%c.bsr" - Full Backup Pool = Full # write Full Backups into "Full" Pool - Differential Backup Pool = Differential # write Diff Backups into "Differential" Pool - Incremental Backup Pool = Incremental # write Incr Backups into "Incremental" Pool -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Daemon.conf.in deleted file mode 100644 index cf6a8cfa1e2..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Daemon.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Daemon - Description = "Message delivery for daemon messages (no job)." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !audit - append = "@logdir@/bareos-audit.log" = audit -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Standard.conf.in deleted file mode 100644 index b3556ba8c23..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/messages/Standard.conf.in +++ /dev/null @@ -1,7 +0,0 @@ -Messages { - Name = Standard - Description = "Reasonable message delivery -- send most everything to email address and to the console." - console = all, !skipped, !saved, !audit - append = "@logdir@/bareos.log" = all, !skipped, !saved, !audit - catalog = all, !skipped, !saved, !audit -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Differential.conf deleted file mode 100644 index 25ce24821ab..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Differential.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Differential - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 90 days # How long should the Differential Backups be kept? (#09) - Maximum Volume Bytes = 10G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Differential-" # Volumes will be labeled "Differential-" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Full.conf deleted file mode 100644 index 867fc66b483..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Full.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Full - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 365 days # How long should the Full Backups be kept? (#06) - Maximum Volume Bytes = 50G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Full-" # Volumes will be labeled "Full-" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Incremental.conf deleted file mode 100644 index f4dbbab6650..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Incremental.conf +++ /dev/null @@ -1,10 +0,0 @@ -Pool { - Name = Incremental - Pool Type = Backup - Recycle = yes # Bareos can automatically recycle Volumes - AutoPrune = yes # Prune expired volumes - Volume Retention = 30 days # How long should the Incremental Backups be kept? (#12) - Maximum Volume Bytes = 1G # Limit Volume size to something reasonable - Maximum Volumes = 100 # Limit number of Volumes in Pool - Label Format = "Incremental-" # Volumes will be labeled "Incremental-" -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Scratch.conf deleted file mode 100644 index 3a489b19871..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/pool/Scratch.conf +++ /dev/null @@ -1,4 +0,0 @@ -Pool { - Name = Scratch - Pool Type = Scratch -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/profile/operator.conf deleted file mode 100644 index 6edd0166dca..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/profile/operator.conf +++ /dev/null @@ -1,18 +0,0 @@ -Profile { - Name = operator - Description = "Profile allowing normal Bareos operations." - - Command ACL = !.bvfs_clear_cache, !.exit, !.sql - Command ACL = !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount - Command ACL = *all* - - Catalog ACL = *all* - Client ACL = *all* - FileSet ACL = *all* - Job ACL = *all* - Plugin Options ACL = *all* - Pool ACL = *all* - Schedule ACL = *all* - Storage ACL = *all* - Where ACL = *all* -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/storage/File.conf.in deleted file mode 100644 index a2622f719e2..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bareos-dir.d/storage/File.conf.in +++ /dev/null @@ -1,8 +0,0 @@ -Storage { - Name = File - Address = @hostname@ - Password = "@sd_password@" - Device = FileStorage - Media Type = File - SD Port = @sd_port@ -} diff --git a/systemtests/tests/reload-unchanged-config/etc/bareos/bconsole.conf.in b/systemtests/tests/reload-unchanged-config/etc/bareos/bconsole.conf.in deleted file mode 100644 index 50b647c1d71..00000000000 --- a/systemtests/tests/reload-unchanged-config/etc/bareos/bconsole.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bareos User Agent (or Console) Configuration File -# - -Director { - Name = @basename@-dir - DIRport = @dir_port@ - Address = @hostname@ - Password = "@dir_password@" -} diff --git a/systemtests/tests/reload/CMakeLists.txt b/systemtests/tests/reload/CMakeLists.txt new file mode 100644 index 00000000000..ff6b8602fc8 --- /dev/null +++ b/systemtests/tests/reload/CMakeLists.txt @@ -0,0 +1,2 @@ +get_filename_component(BASENAME ${CMAKE_CURRENT_BINARY_DIR} NAME) +create_systemtest(${SYSTEMTEST_PREFIX} ${BASENAME}) diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/messages/Daemon.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/messages/Daemon.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/messages/Daemon.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/messages/Standard.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/messages/Standard.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/messages/Standard.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Differential.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Differential.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Differential.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Full.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Full.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Full.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Incremental.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Incremental.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Incremental.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Scratch.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/pool/Scratch.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/pool/Scratch.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/reload/etc/bareos/bareos-dir.d/profile/operator.conf similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/profile/operator.conf rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/profile/operator.conf diff --git a/systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/reload/etc/bareos/bareos-dir.d/storage/File.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bareos-dir.d/storage/File.conf.in rename to systemtests/tests/reload/etc/bareos/bareos-dir.d/storage/File.conf.in diff --git a/systemtests/tests/reload-add-client/etc/bareos/bconsole.conf.in b/systemtests/tests/reload/etc/bareos/bconsole.conf.in similarity index 100% rename from systemtests/tests/reload-add-client/etc/bareos/bconsole.conf.in rename to systemtests/tests/reload/etc/bareos/bconsole.conf.in diff --git a/systemtests/scripts/reload_test_functions b/systemtests/tests/reload/reload_test_functions similarity index 96% rename from systemtests/scripts/reload_test_functions rename to systemtests/tests/reload/reload_test_functions index 4cf54dc1b05..3d5cbaf4d6d 100644 --- a/systemtests/scripts/reload_test_functions +++ b/systemtests/tests/reload/reload_test_functions @@ -8,6 +8,10 @@ exit_with_error() { exit 1 } +setup_config() { + rm -f "${config_directory_dir_additional_test_config}"/* +} + stop_director() { "${rscripts}/bareos-ctl-dir" stop } @@ -73,7 +77,7 @@ Client { Name = bareos-fd-2 Description = "Another Client resource." Address = localhost - Password = "@fd_password@" # password for FileDaemon + Password = "@fd_password@" } END_OF_DATA } diff --git a/systemtests/tests/reload/test-setup b/systemtests/tests/reload/test-setup new file mode 100755 index 00000000000..4f826b5e56e --- /dev/null +++ b/systemtests/tests/reload/test-setup @@ -0,0 +1,23 @@ +#!/bin/bash +set -e +set -o pipefail +set -u + +#shellcheck source=../environment.in +. ./environment +#shellcheck source=../scripts/functions +. "${rscripts}"/functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions + +export director_debug_level="" +#director_debug_level="-d 200" + +#be sure no director is started +stop_director + +#cleanup possible leftover from last run +${rscripts}/cleanup +${rscripts}/setup + +start_director diff --git a/systemtests/tests/reload-add-client/testrunner b/systemtests/tests/reload/testrunner-add-client similarity index 67% rename from systemtests/tests/reload-add-client/testrunner rename to systemtests/tests/reload/testrunner-add-client index 1ec9860ad2a..5ac6c93ecae 100755 --- a/systemtests/tests/reload-add-client/testrunner +++ b/systemtests/tests/reload/testrunner-add-client @@ -4,50 +4,34 @@ set -o pipefail set -u #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions + +TestName="$(get_test_name "$0")" +export TestName +export estat temporary_config_file="$config_directory_dir_additional_test_config/another_client.conf" bconsole_command_file="$tmp/bconsole_reload_command" console_logfile="$tmp/console.log" console_show_client_output_file="$tmp/list_of_clients.out" -director_debug_level="" -#director_debug_level="-d 200" - - - - ############################################ start_test ############################################ -#be sure no director is started -stop_director - -#cleanup possible leftover from last run -${rscripts}/cleanup -remove_console_logfiles - -${rscripts}/setup -start_director +remove_console_logfile +setup_config #reload modified config add_another_client test_reload_will_not_crash_director find_added_client_in_config -stop_director - ############################################ end_test ############################################ diff --git a/systemtests/tests/reload-add-duplicate-job/testrunner b/systemtests/tests/reload/testrunner-add-duplicate-job similarity index 76% rename from systemtests/tests/reload-add-duplicate-job/testrunner rename to systemtests/tests/reload/testrunner-add-duplicate-job index ed9a8a77042..e3f5273ec31 100755 --- a/systemtests/tests/reload-add-duplicate-job/testrunner +++ b/systemtests/tests/reload/testrunner-add-duplicate-job @@ -6,17 +6,16 @@ set -u #set -x #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions + +TestName="$(get_test_name "$0")" +export TestName +export estat temporary_job_config_file="$config_directory_dir_additional_test_config/new_duplicated_job.conf" bconsole_command_file="$tmp/bconsole_reload_command" @@ -31,23 +30,14 @@ director_debug_level="" start_test ############################################ -#be sure no director is started -stop_director - -#cleanup possible leftover from last run -${rscripts}/cleanup remove_console_logfile -${rscripts}/setup -start_director - +setup_config #reload modified config add_duplicate_job_to_config test_reload_will_not_crash_director find_error_string_in_console_log 'Attempt to define second Job resource named "backup-bareos-fd" is not permitted' -stop_director - ############################################ end_test ############################################ diff --git a/systemtests/tests/reload-add-empty-job/testrunner b/systemtests/tests/reload/testrunner-add-empty-job similarity index 70% rename from systemtests/tests/reload-add-empty-job/testrunner rename to systemtests/tests/reload/testrunner-add-empty-job index e19709602cf..a801788a72b 100755 --- a/systemtests/tests/reload-add-empty-job/testrunner +++ b/systemtests/tests/reload/testrunner-add-empty-job @@ -4,46 +4,33 @@ set -o pipefail set -u #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions + +TestName="$(get_test_name "$0")" +export TestName +export estat export temporary_job_config_file="$config_directory_dir_additional_test_config/new_empty_job_definition.conf" export bconsole_command_file="$tmp/bconsole_reload_command" export console_logfile="$tmp/console.log" -export director_debug_level="" -#director_debug_level="-d 200" - ############################################ start_test ############################################ -#be sure no director is started -stop_director - -#cleanup possible leftover from last run -${rscripts}/cleanup remove_console_logfile -${rscripts}/setup -start_director - +setup_config #reload modified config add_empty_job_to_config test_reload_will_not_crash_director find_error_string_in_console_log 'Config error: Name not specified for resource' -stop_director - ############################################ end_test ############################################ diff --git a/systemtests/tests/reload-add-second-director/testrunner b/systemtests/tests/reload/testrunner-add-second-director similarity index 73% rename from systemtests/tests/reload-add-second-director/testrunner rename to systemtests/tests/reload/testrunner-add-second-director index bb4582717ff..4d22e12f088 100755 --- a/systemtests/tests/reload-add-second-director/testrunner +++ b/systemtests/tests/reload/testrunner-add-second-director @@ -6,48 +6,34 @@ set -u #set -x #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions +TestName="$(get_test_name "$0")" +export TestName +export estat export temporary_director_config_file="$config_directory_dir_additional_test_config/another_director.conf" export bconsole_command_file="$tmp/bconsole_reload_command" console_logfile="$tmp/console.log" -export director_debug_level="" -#director_debug_level="-d 200" - - ############################################ start_test ############################################ -#be sure no director is started -stop_director - #cleanup possible leftover from last run -${rscripts}/cleanup remove_console_logfile -${rscripts}/setup -start_director - +setup_config #reload modified config add_duplicate_dir_to_config test_reload_will_not_crash_director find_error_string_in_console_log 'Fatal error: Only one Director resource permitted' -stop_director - ############################################ end_test ############################################ diff --git a/systemtests/tests/reload-add-uncommented-string/testrunner b/systemtests/tests/reload/testrunner-add-uncommented-string similarity index 74% rename from systemtests/tests/reload-add-uncommented-string/testrunner rename to systemtests/tests/reload/testrunner-add-uncommented-string index 19f9aacb0de..103176e53f2 100755 --- a/systemtests/tests/reload-add-uncommented-string/testrunner +++ b/systemtests/tests/reload/testrunner-add-uncommented-string @@ -4,48 +4,36 @@ set -o pipefail set -u #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions + +TestName="$(get_test_name "$0")" +export TestName +export estat temporary_config_file="$config_directory_dir_additional_test_config/uncommented_string.conf" bconsole_command_file="$tmp/bconsole_reload_command" console_logfile="$tmp/console.log" -director_debug_level="" -#director_debug_level="-d 200" - ############################################ start_test ############################################ -#be sure no director is started -stop_director - #cleanup possible leftover from last run -${rscripts}/cleanup remove_console_logfile -${rscripts}/setup -start_director - +setup_config #reload modified config add_uncommented_string_to_config test_reload_will_not_crash_director find_error_string_in_console_log 'This is an uncommented string that causes a config abort.' -stop_director - ############################################ end_test ############################################ diff --git a/systemtests/tests/reload-unchanged-config/testrunner b/systemtests/tests/reload/testrunner-unchanged-config similarity index 65% rename from systemtests/tests/reload-unchanged-config/testrunner rename to systemtests/tests/reload/testrunner-unchanged-config index a440a4294ad..a358234c32a 100755 --- a/systemtests/tests/reload-unchanged-config/testrunner +++ b/systemtests/tests/reload/testrunner-unchanged-config @@ -4,42 +4,29 @@ set -o pipefail set -u #trap read debug -TestName="$(basename "$(pwd)")" - -export TestName -export estat - #shellcheck source=../environment.in . ./environment #shellcheck source=../scripts/functions . "${rscripts}"/functions -#shellcheck source=../scripts/reload_test_functions -. "${rscripts}"/reload_test_functions +#shellcheck source=./reload_test_functions +. ./reload_test_functions +TestName="$(get_test_name "$0")" +export TestName +export estat bconsole_command_file="$tmp/bconsole_reload_command" console_logfile="$tmp/console.log" -director_debug_level="" -#director_debug_level="-d 200" - ############################################ start_test ############################################ -stop_director #be sure no director is started - -${rscripts}/cleanup -${rscripts}/setup - -start_director - +setup_config #reload unmodified config test_reload_will_not_crash_director -stop_director - ############################################ end_test ############################################