systemtest: rename copy to copy-migrate

bareos · Oct 20, 2022 · cc5bfe4 · cc5bfe4
1 parent 6e4d649
commit cc5bfe4
Show file tree

Hide file tree

Showing 35 changed files with 16 additions and 12 deletions.
diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ add_subdirectory(client-initiated)
 add_subdirectory(commandline-options)
 add_subdirectory(config-dump)
 add_subdirectory(config-syntax-crash)
-add_subdirectory(copy)
+add_subdirectory(copy-migrate)
 add_subdirectory(copy-archive-job)
 add_subdirectory(copy-remote-bscan)
 add_subdirectory(dbcopy-mysql-postgresql)

diff --git a/systemtests/tests/copy/CMakeLists.txt → ...emtests/tests/copy-migrate/CMakeLists.txt b/systemtests/tests/copy/CMakeLists.txt → ...emtests/tests/copy-migrate/CMakeLists.txt
@@ -21,24 +21,28 @@ get_filename_component(BASENAME ${CMAKE_CURRENT_BINARY_DIR} NAME)
 create_systemtest(${SYSTEMTEST_PREFIX} ${BASENAME})
 
 set_tests_properties(
-  system:copy:01-backup PROPERTIES FIXTURES_SETUP "system:copy:01-backup"
-                                   FIXTURES_REQUIRED "system:copy-fixture"
+  system:copy-migrate:01-backup
+  PROPERTIES FIXTURES_SETUP "system:copy-migrate:01-backup" FIXTURES_REQUIRED
+             "system:copy-migrate-fixture"
 )
 set_tests_properties(
-  system:copy:02-copy
-  PROPERTIES FIXTURES_SETUP "system:copy:02-copy" FIXTURES_REQUIRED
-             "system:copy:01-backup;system:copy-fixture"
+  system:copy-migrate:02-copy
+  PROPERTIES FIXTURES_SETUP "system:copy-migrate:02-copy" FIXTURES_REQUIRED
+             "system:copy-migrate:01-backup;system:copy-migrate-fixture"
 )
 set_tests_properties(
-  system:copy:03-impossible-copy
-  PROPERTIES FIXTURES_SETUP "system:copy:03-impossible-copy" FIXTURES_REQUIRED
-             "system:copy:02-copy;system:copy:01-backup;system:copy-fixture"
+  system:copy-migrate:03-impossible-copy
+  PROPERTIES
+    FIXTURES_SETUP
+    "system:copy-migrate:03-impossible-copy"
+    FIXTURES_REQUIRED
+    "system:copy-migrate:02-copy;system:copy-migrate:01-backup;system:copy-migrate-fixture"
 )
 set_tests_properties(
-  system:copy:04-bscan
+  system:copy-migrate:04-bscan
   PROPERTIES
     FIXTURES_SETUP
-    "system:copy:04-bscan"
+    "system:copy-migrate:04-bscan"
     FIXTURES_REQUIRED
-    "system:copy:03-impossible-copy;system:copy:02-copy;system:copy:01-backup;system:copy-fixture"
+    "system:copy-migrate:03-impossible-copy;system:copy-migrate:02-copy;system:copy-migrate:01-backup;system:copy-migrate-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/...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/...opy/etc/bareos/bareos-dir.d/job/copy.conf → ...ate/etc/bareos/bareos-dir.d/job/copy.conf b/...opy/etc/bareos/bareos-dir.d/job/copy.conf → ...ate/etc/bareos/bareos-dir.d/job/copy.conf
diff --git a/.../etc/bareos/bareos-dir.d/job/migrate.conf → .../etc/bareos/bareos-dir.d/job/migrate.conf b/.../etc/bareos/bareos-dir.d/job/migrate.conf → .../etc/bareos/bareos-dir.d/job/migrate.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/...py/etc/bareos/bareos-dir.d/pool/Full.conf → ...te/etc/bareos/bareos-dir.d/pool/Full.conf b/...py/etc/bareos/bareos-dir.d/pool/Full.conf → ...te/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/...tc/bareos/bareos-dir.d/pool/FullCopy.conf → ...tc/bareos/bareos-dir.d/pool/FullCopy.conf b/...tc/bareos/bareos-dir.d/pool/FullCopy.conf → ...tc/bareos/bareos-dir.d/pool/FullCopy.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/...s/bareos-dir.d/storage/NoSuchStorage.conf → ...s/bareos-dir.d/storage/NoSuchStorage.conf b/...s/bareos-dir.d/storage/NoSuchStorage.conf → ...s/bareos-dir.d/storage/NoSuchStorage.conf
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/...ts/tests/copy/etc/bareos/bconsole.conf.in → .../copy-migrate/etc/bareos/bconsole.conf.in b/...ts/tests/copy/etc/bareos/bconsole.conf.in → .../copy-migrate/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/copy/testrunner-01-backup → ...s/tests/copy-migrate/testrunner-01-backup b/systemtests/tests/copy/testrunner-01-backup → ...s/tests/copy-migrate/testrunner-01-backup
diff --git a/systemtests/tests/copy/testrunner-02-copy → ...sts/tests/copy-migrate/testrunner-02-copy b/systemtests/tests/copy/testrunner-02-copy → ...sts/tests/copy-migrate/testrunner-02-copy
diff --git a/.../tests/copy/testrunner-03-impossible-copy → ...opy-migrate/testrunner-03-impossible-copy b/.../tests/copy/testrunner-03-impossible-copy → ...opy-migrate/testrunner-03-impossible-copy
diff --git a/systemtests/tests/copy/testrunner-04-bscan → ...ts/tests/copy-migrate/testrunner-04-bscan b/systemtests/tests/copy/testrunner-04-bscan → ...ts/tests/copy-migrate/testrunner-04-bscan
diff --git a/systemtests/tests/copy/testrunner-05-migrate → .../tests/copy-migrate/testrunner-05-migrate b/systemtests/tests/copy/testrunner-05-migrate → .../tests/copy-migrate/testrunner-05-migrate