restore: change test names

bareos · Mar 2, 2023 · 71fa6b8 · 71fa6b8
1 parent 12ae769
commit 71fa6b8
Show file tree

Hide file tree

Showing 37 changed files with 21 additions and 21 deletions.
diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
@@ -74,7 +74,7 @@ add_subdirectory(python-pam)
 add_subdirectory(quota-softquota)
 add_subdirectory(reload)
 add_subdirectory(restapi)
-add_subdirectory(restore-test)
+add_subdirectory(restore)
 add_subdirectory(scheduler)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)

diff --git a/...emtests/tests/restore-test/CMakeLists.txt → systemtests/tests/restore/CMakeLists.txt b/...emtests/tests/restore-test/CMakeLists.txt → systemtests/tests/restore/CMakeLists.txt
@@ -21,60 +21,60 @@ get_filename_component(BASENAME ${CMAKE_CURRENT_BINARY_DIR} NAME)
 create_systemtest(${SYSTEMTEST_PREFIX} ${BASENAME})
 
 set_tests_properties(
-  system:restore-test:create-backup
-  PROPERTIES FIXTURES_SETUP "system:restore-test:backup-job-fixture"
+  system:restore:create-backup
+  PROPERTIES FIXTURES_SETUP "system:restore:backup-job-fixture"
 )
 set_tests_properties(
-  system:restore-test:archive-restore-file
+  system:restore:archive-restore-file
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:archive-restore-dir
+  system:restore:archive-restore-dir
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:archive-full-restore
+  system:restore:archive-full-restore
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:restore-file
+  system:restore:restore-file
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:restore-dir
+  system:restore:restore-dir
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:full-restore
+  system:restore:full-restore
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:check-hints
+  system:restore:check-hints
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:restore-old-archive
+  system:restore:restore-old-archive
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-fixture"
 )
 set_tests_properties(
-  system:restore-test:error-full-restore
+  system:restore:error-full-restore
   PROPERTIES
     FIXTURES_REQUIRED
-    "system:restore-test:backup-job-fixture;system:restore-test-fixture"
+    "system:restore:backup-job-fixture;system:restore-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/...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/...st/etc/bareos/bareos-dir.d/pool/Full.conf → ...re/etc/bareos/bareos-dir.d/pool/Full.conf b/...st/etc/bareos/bareos-dir.d/pool/Full.conf → ...re/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/.../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/.../restore-test/etc/bareos/bconsole.conf.in → ...tests/restore/etc/bareos/bconsole.conf.in b/.../restore-test/etc/bareos/bconsole.conf.in → ...tests/restore/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/restore-test/functions → systemtests/tests/restore/functions b/systemtests/tests/restore-test/functions → systemtests/tests/restore/functions
diff --git a/systemtests/tests/restore-test/test-setup → systemtests/tests/restore/test-setup b/systemtests/tests/restore-test/test-setup → systemtests/tests/restore/test-setup
diff --git a/...tore-test/testrunner-archive-full-restore → ...s/restore/testrunner-archive-full-restore b/...tore-test/testrunner-archive-full-restore → ...s/restore/testrunner-archive-full-restore
diff --git a/...store-test/testrunner-archive-restore-dir → ...ts/restore/testrunner-archive-restore-dir b/...store-test/testrunner-archive-restore-dir → ...ts/restore/testrunner-archive-restore-dir
diff --git a/...tore-test/testrunner-archive-restore-file → ...s/restore/testrunner-archive-restore-file b/...tore-test/testrunner-archive-restore-file → ...s/restore/testrunner-archive-restore-file
diff --git a/...tests/restore-test/testrunner-check-hints → ...ests/tests/restore/testrunner-check-hints b/...tests/restore-test/testrunner-check-hints → ...ests/tests/restore/testrunner-check-hints
diff --git a/...sts/restore-test/testrunner-create-backup → ...ts/tests/restore/testrunner-create-backup b/...sts/restore-test/testrunner-create-backup → ...ts/tests/restore/testrunner-create-backup
diff --git a/...estore-test/testrunner-error-full-restore → ...sts/restore/testrunner-error-full-restore b/...estore-test/testrunner-error-full-restore → ...sts/restore/testrunner-error-full-restore
diff --git a/...ests/restore-test/testrunner-full-restore → ...sts/tests/restore/testrunner-full-restore b/...ests/restore-test/testrunner-full-restore → ...sts/tests/restore/testrunner-full-restore
diff --git a/...tests/restore-test/testrunner-restore-dir → ...ests/tests/restore/testrunner-restore-dir b/...tests/restore-test/testrunner-restore-dir → ...ests/tests/restore/testrunner-restore-dir
diff --git a/...ests/restore-test/testrunner-restore-file → ...sts/tests/restore/testrunner-restore-file b/...ests/restore-test/testrunner-restore-file → ...sts/tests/restore/testrunner-restore-file
diff --git a/...store-test/testrunner-restore-old-archive → ...ts/restore/testrunner-restore-old-archive b/...store-test/testrunner-restore-old-archive → ...ts/restore/testrunner-restore-old-archive