systemtests: rename bareos and bconsole

bareos · Jan 30, 2023 · 1c217fc · 1c217fc
1 parent c3ad2e0
commit 1c217fc
Show file tree

Hide file tree

Showing 70 changed files with 6 additions and 6 deletions.
diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
@@ -20,9 +20,9 @@ message("Adding systemtests from ${CMAKE_CURRENT_SOURCE_DIR}")
 add_subdirectory(acl)
 add_subdirectory(always-incremental-consolidate)
 add_subdirectory(autochanger)
-add_subdirectory(bareos)
+add_subdirectory(bareos-basic)
 add_subdirectory(bareos-acl)
-add_subdirectory(bconsole)
+add_subdirectory(bconsole-basic)
 add_subdirectory(bconsole-pam)
 add_subdirectory(block-size)
 add_subdirectory(bscan-bextract-bls-bcopy)

diff --git a/systemtests/tests/bareos/CMakeLists.txt → ...emtests/tests/bareos-basic/CMakeLists.txt b/systemtests/tests/bareos/CMakeLists.txt → ...emtests/tests/bareos-basic/CMakeLists.txt
@@ -21,11 +21,11 @@ get_filename_component(BASENAME ${CMAKE_CURRENT_BINARY_DIR} NAME)
 create_systemtest(${SYSTEMTEST_PREFIX} ${BASENAME})
 
 set_tests_properties(
-  system:bareos:simple-backup-and-restore
-  PROPERTIES FIXTURES_SETUP "system:bareos:backup-job-fixture"
+  system:bareos-basic:simple-backup-and-restore
+  PROPERTIES FIXTURES_SETUP "system:bareos-basic:backup-job-fixture"
 )
 set_tests_properties(
-  system:bareos:status-subscriptions
+  system:bareos-basic:status-subscriptions
   PROPERTIES FIXTURES_REQUIRED
-             "system:bareos:backup-job-fixture;system:bareos-fixture"
+             "system:bareos-basic:backup-job-fixture;system:bareos-basic-fixture"
 )
diff --git a/...os/bareos-dir.d/catalog/MyCatalog.conf.in → ...os/bareos-dir.d/catalog/MyCatalog.conf.in b/...os/bareos-dir.d/catalog/MyCatalog.conf.in → ...os/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/...eos/bareos-dir.d/client/bareos-fd.conf.in → ...eos/bareos-dir.d/client/bareos-fd.conf.in b/...eos/bareos-dir.d/client/bareos-fd.conf.in → ...eos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/.../bareos-dir.d/director/bareos-dir.conf.in → .../bareos-dir.d/director/bareos-dir.conf.in b/.../bareos-dir.d/director/bareos-dir.conf.in → .../bareos-dir.d/director/bareos-dir.conf.in
diff --git a/...reos/bareos-dir.d/fileset/Catalog.conf.in → ...reos/bareos-dir.d/fileset/Catalog.conf.in b/...reos/bareos-dir.d/fileset/Catalog.conf.in → ...reos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/...eos/bareos-dir.d/fileset/SelfTest.conf.in → ...eos/bareos-dir.d/fileset/SelfTest.conf.in b/...eos/bareos-dir.d/fileset/SelfTest.conf.in → ...eos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/...os/bareos-dir.d/job/BackupCatalog.conf.in → ...os/bareos-dir.d/job/BackupCatalog.conf.in b/...os/bareos-dir.d/job/BackupCatalog.conf.in → ...os/bareos-dir.d/job/BackupCatalog.conf.in
diff --git a/...eos/bareos-dir.d/job/RestoreFiles.conf.in → ...eos/bareos-dir.d/job/RestoreFiles.conf.in b/...eos/bareos-dir.d/job/RestoreFiles.conf.in → ...eos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/...os/bareos-dir.d/job/backup-bareos-fd.conf → ...os/bareos-dir.d/job/backup-bareos-fd.conf b/...os/bareos-dir.d/job/backup-bareos-fd.conf → ...os/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/...os/bareos-dir.d/job/long-name-backup.conf → ...os/bareos-dir.d/job/long-name-backup.conf b/...os/bareos-dir.d/job/long-name-backup.conf → ...os/bareos-dir.d/job/long-name-backup.conf
diff --git a/...c/bareos/bareos-dir.d/job/recyclejob.conf → ...c/bareos/bareos-dir.d/job/recyclejob.conf b/...c/bareos/bareos-dir.d/job/recyclejob.conf → ...c/bareos/bareos-dir.d/job/recyclejob.conf
diff --git a/...s/bareos-dir.d/jobdefs/DefaultJob.conf.in → ...s/bareos-dir.d/jobdefs/DefaultJob.conf.in b/...s/bareos-dir.d/jobdefs/DefaultJob.conf.in → ...s/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/...reos/bareos-dir.d/messages/Daemon.conf.in → ...reos/bareos-dir.d/messages/Daemon.conf.in b/...reos/bareos-dir.d/messages/Daemon.conf.in → ...reos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/...os/bareos-dir.d/messages/Standard.conf.in → ...os/bareos-dir.d/messages/Standard.conf.in b/...os/bareos-dir.d/messages/Standard.conf.in → ...os/bareos-dir.d/messages/Standard.conf.in
diff --git a/...areos/bareos-dir.d/pool/Differential.conf → ...areos/bareos-dir.d/pool/Differential.conf b/...areos/bareos-dir.d/pool/Differential.conf → ...areos/bareos-dir.d/pool/Differential.conf
diff --git a/...os/etc/bareos/bareos-dir.d/pool/Full.conf → ...ic/etc/bareos/bareos-dir.d/pool/Full.conf b/...os/etc/bareos/bareos-dir.d/pool/Full.conf → ...ic/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/...bareos/bareos-dir.d/pool/Incremental.conf → ...bareos/bareos-dir.d/pool/Incremental.conf b/...bareos/bareos-dir.d/pool/Incremental.conf → ...bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/...etc/bareos/bareos-dir.d/pool/Scratch.conf → ...etc/bareos/bareos-dir.d/pool/Scratch.conf b/...etc/bareos/bareos-dir.d/pool/Scratch.conf → ...etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/...areos/bareos-dir.d/pool/quickrecycle.conf → ...areos/bareos-dir.d/pool/quickrecycle.conf b/...areos/bareos-dir.d/pool/quickrecycle.conf → ...areos/bareos-dir.d/pool/quickrecycle.conf
diff --git a/...bareos/bareos-dir.d/profile/operator.conf → ...bareos/bareos-dir.d/profile/operator.conf b/...bareos/bareos-dir.d/profile/operator.conf → ...bareos/bareos-dir.d/profile/operator.conf
diff --git a/.../bareos/bareos-dir.d/storage/File.conf.in → .../bareos/bareos-dir.d/storage/File.conf.in b/.../bareos/bareos-dir.d/storage/File.conf.in → .../bareos/bareos-dir.d/storage/File.conf.in
diff --git a/.../bareos/bareos-fd.d/client/myself.conf.in → .../bareos/bareos-fd.d/client/myself.conf.in b/.../bareos/bareos-fd.d/client/myself.conf.in → .../bareos/bareos-fd.d/client/myself.conf.in
diff --git a/...s/bareos-fd.d/director/bareos-dir.conf.in → ...s/bareos-fd.d/director/bareos-dir.conf.in b/...s/bareos-fd.d/director/bareos-dir.conf.in → ...s/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/...bareos/bareos-fd.d/messages/Standard.conf → ...bareos/bareos-fd.d/messages/Standard.conf b/...bareos/bareos-fd.d/messages/Standard.conf → ...bareos/bareos-fd.d/messages/Standard.conf
diff --git a/...areos/bareos-sd.d/device/FileStorage.conf → ...areos/bareos-sd.d/device/FileStorage.conf b/...areos/bareos-sd.d/device/FileStorage.conf → ...areos/bareos-sd.d/device/FileStorage.conf
diff --git a/...s/bareos-sd.d/director/bareos-dir.conf.in → ...s/bareos-sd.d/director/bareos-dir.conf.in b/...s/bareos-sd.d/director/bareos-dir.conf.in → ...s/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/...bareos/bareos-sd.d/messages/Standard.conf → ...bareos/bareos-sd.d/messages/Standard.conf b/...bareos/bareos-sd.d/messages/Standard.conf → ...bareos/bareos-sd.d/messages/Standard.conf
diff --git a/...eos/bareos-sd.d/storage/bareos-sd.conf.in → ...eos/bareos-sd.d/storage/bareos-sd.conf.in b/...eos/bareos-sd.d/storage/bareos-sd.conf.in → ...eos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/.../tests/bareos/etc/bareos/bconsole.conf.in → .../bareos-basic/etc/bareos/bconsole.conf.in b/.../tests/bareos/etc/bareos/bconsole.conf.in → .../bareos-basic/etc/bareos/bconsole.conf.in
diff --git a/.../expected/status-subscriptions-detail.txt → .../expected/status-subscriptions-detail.txt b/.../expected/status-subscriptions-detail.txt → .../expected/status-subscriptions-detail.txt
diff --git a/...expected/status-subscriptions-unknown.txt → ...expected/status-subscriptions-unknown.txt b/...expected/status-subscriptions-unknown.txt → ...expected/status-subscriptions-unknown.txt
diff --git a/.../bareos/expected/status-subscriptions.txt → ...s-basic/expected/status-subscriptions.txt b/.../bareos/expected/status-subscriptions.txt → ...s-basic/expected/status-subscriptions.txt
diff --git a/systemtests/tests/bareos/test-setup → systemtests/tests/bareos-basic/test-setup b/systemtests/tests/bareos/test-setup → systemtests/tests/bareos-basic/test-setup
diff --git a/.../bareos/testrunner-filesettext-is-updated → ...s-basic/testrunner-filesettext-is-updated b/.../bareos/testrunner-filesettext-is-updated → ...s-basic/testrunner-filesettext-is-updated
diff --git a/...mtests/tests/bareos/testrunner-rerun-jobs → .../tests/bareos-basic/testrunner-rerun-jobs b/...mtests/tests/bareos/testrunner-rerun-jobs → .../tests/bareos-basic/testrunner-rerun-jobs
diff --git a/.../bareos/testrunner-run-non-existing-jobid → ...s-basic/testrunner-run-non-existing-jobid b/.../bareos/testrunner-run-non-existing-jobid → ...s-basic/testrunner-run-non-existing-jobid
diff --git a/...reos/testrunner-simple-backup-and-restore → ...asic/testrunner-simple-backup-and-restore b/...reos/testrunner-simple-backup-and-restore → ...asic/testrunner-simple-backup-and-restore
diff --git a/...ts/bareos/testrunner-status-subscriptions → ...eos-basic/testrunner-status-subscriptions b/...ts/bareos/testrunner-status-subscriptions → ...eos-basic/testrunner-status-subscriptions
diff --git a/...areos/testrunner-test-make-catalog-backup → ...basic/testrunner-test-make-catalog-backup b/...areos/testrunner-test-make-catalog-backup → ...basic/testrunner-test-make-catalog-backup
diff --git a/...sts/bareos/testrunner-very-long-job-names → ...reos-basic/testrunner-very-long-job-names b/...sts/bareos/testrunner-very-long-job-names → ...reos-basic/testrunner-very-long-job-names
diff --git a/.../tests/bareos/testrunner-volume-recycling → .../bareos-basic/testrunner-volume-recycling b/.../tests/bareos/testrunner-volume-recycling → .../bareos-basic/testrunner-volume-recycling
diff --git a/systemtests/tests/bconsole/CMakeLists.txt → ...tests/tests/bconsole-basic/CMakeLists.txt b/systemtests/tests/bconsole/CMakeLists.txt → ...tests/tests/bconsole-basic/CMakeLists.txt
diff --git a/...os/bareos-dir.d/catalog/MyCatalog.conf.in → ...os/bareos-dir.d/catalog/MyCatalog.conf.in b/...os/bareos-dir.d/catalog/MyCatalog.conf.in → ...os/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/...eos/bareos-dir.d/client/bareos-fd.conf.in → ...eos/bareos-dir.d/client/bareos-fd.conf.in b/...eos/bareos-dir.d/client/bareos-fd.conf.in → ...eos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/.../bareos-dir.d/director/bareos-dir.conf.in → .../bareos-dir.d/director/bareos-dir.conf.in b/.../bareos-dir.d/director/bareos-dir.conf.in → .../bareos-dir.d/director/bareos-dir.conf.in
diff --git a/...reos/bareos-dir.d/fileset/Catalog.conf.in → ...reos/bareos-dir.d/fileset/Catalog.conf.in b/...reos/bareos-dir.d/fileset/Catalog.conf.in → ...reos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/...eos/bareos-dir.d/fileset/SelfTest.conf.in → ...eos/bareos-dir.d/fileset/SelfTest.conf.in b/...eos/bareos-dir.d/fileset/SelfTest.conf.in → ...eos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/...eos/bareos-dir.d/job/RestoreFiles.conf.in → ...eos/bareos-dir.d/job/RestoreFiles.conf.in b/...eos/bareos-dir.d/job/RestoreFiles.conf.in → ...eos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/...os/bareos-dir.d/job/backup-bareos-fd.conf → ...os/bareos-dir.d/job/backup-bareos-fd.conf b/...os/bareos-dir.d/job/backup-bareos-fd.conf → ...os/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/...s/bareos-dir.d/jobdefs/DefaultJob.conf.in → ...s/bareos-dir.d/jobdefs/DefaultJob.conf.in b/...s/bareos-dir.d/jobdefs/DefaultJob.conf.in → ...s/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/...reos/bareos-dir.d/messages/Daemon.conf.in → ...reos/bareos-dir.d/messages/Daemon.conf.in b/...reos/bareos-dir.d/messages/Daemon.conf.in → ...reos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/...os/bareos-dir.d/messages/Standard.conf.in → ...os/bareos-dir.d/messages/Standard.conf.in b/...os/bareos-dir.d/messages/Standard.conf.in → ...os/bareos-dir.d/messages/Standard.conf.in
diff --git a/...areos/bareos-dir.d/pool/Differential.conf → ...areos/bareos-dir.d/pool/Differential.conf b/...areos/bareos-dir.d/pool/Differential.conf → ...areos/bareos-dir.d/pool/Differential.conf
diff --git a/...le/etc/bareos/bareos-dir.d/pool/Full.conf → ...ic/etc/bareos/bareos-dir.d/pool/Full.conf b/...le/etc/bareos/bareos-dir.d/pool/Full.conf → ...ic/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/...bareos/bareos-dir.d/pool/Incremental.conf → ...bareos/bareos-dir.d/pool/Incremental.conf b/...bareos/bareos-dir.d/pool/Incremental.conf → ...bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/...etc/bareos/bareos-dir.d/pool/Scratch.conf → ...etc/bareos/bareos-dir.d/pool/Scratch.conf b/...etc/bareos/bareos-dir.d/pool/Scratch.conf → ...etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/...bareos/bareos-dir.d/profile/operator.conf → ...bareos/bareos-dir.d/profile/operator.conf b/...bareos/bareos-dir.d/profile/operator.conf → ...bareos/bareos-dir.d/profile/operator.conf
diff --git a/.../bareos/bareos-dir.d/storage/File.conf.in → .../bareos/bareos-dir.d/storage/File.conf.in b/.../bareos/bareos-dir.d/storage/File.conf.in → .../bareos/bareos-dir.d/storage/File.conf.in
diff --git a/.../bareos/bareos-fd.d/client/myself.conf.in → .../bareos/bareos-fd.d/client/myself.conf.in b/.../bareos/bareos-fd.d/client/myself.conf.in → .../bareos/bareos-fd.d/client/myself.conf.in
diff --git a/...s/bareos-fd.d/director/bareos-dir.conf.in → ...s/bareos-fd.d/director/bareos-dir.conf.in b/...s/bareos-fd.d/director/bareos-dir.conf.in → ...s/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/...bareos/bareos-fd.d/messages/Standard.conf → ...bareos/bareos-fd.d/messages/Standard.conf b/...bareos/bareos-fd.d/messages/Standard.conf → ...bareos/bareos-fd.d/messages/Standard.conf
diff --git a/...areos/bareos-sd.d/device/FileStorage.conf → ...areos/bareos-sd.d/device/FileStorage.conf b/...areos/bareos-sd.d/device/FileStorage.conf → ...areos/bareos-sd.d/device/FileStorage.conf
diff --git a/...s/bareos-sd.d/director/bareos-dir.conf.in → ...s/bareos-sd.d/director/bareos-dir.conf.in b/...s/bareos-sd.d/director/bareos-dir.conf.in → ...s/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/...bareos/bareos-sd.d/messages/Standard.conf → ...bareos/bareos-sd.d/messages/Standard.conf b/...bareos/bareos-sd.d/messages/Standard.conf → ...bareos/bareos-sd.d/messages/Standard.conf
diff --git a/...eos/bareos-sd.d/storage/bareos-sd.conf.in → ...eos/bareos-sd.d/storage/bareos-sd.conf.in b/...eos/bareos-sd.d/storage/bareos-sd.conf.in → ...eos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/...ests/bconsole/etc/bareos/bconsole.conf.in → ...console-basic/etc/bareos/bconsole.conf.in b/...ests/bconsole/etc/bareos/bconsole.conf.in → ...console-basic/etc/bareos/bconsole.conf.in
diff --git a/.../tests/bconsole/testrunner-autocompletion → .../bconsole-basic/testrunner-autocompletion b/.../tests/bconsole/testrunner-autocompletion → .../bconsole-basic/testrunner-autocompletion
diff --git a/...ts/tests/bconsole/testrunner-dotjobstatus → ...ts/bconsole-basic/testrunner-dotjobstatus b/...ts/tests/bconsole/testrunner-dotjobstatus → ...ts/bconsole-basic/testrunner-dotjobstatus
diff --git a/...s/tests/bconsole/testrunner-status-client → ...s/bconsole-basic/testrunner-status-client b/...s/tests/bconsole/testrunner-status-client → ...s/bconsole-basic/testrunner-status-client