restapi: renamed systemtest python-restapi

bareos · Oct 8, 2021 · 52bf39e · 52bf39e
1 parent 88e2ca7
commit 52bf39e
Show file tree

Hide file tree

Showing 39 changed files with 3 additions and 2 deletions.
diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
@@ -60,9 +60,9 @@ add_subdirectory(py2plug-fd-vmware)
 add_subdirectory(py2plug-sd)
 add_subdirectory(python-bareos)
 add_subdirectory(python-pam)
-add_subdirectory(python-restapi)
 add_subdirectory(quota-softquota)
 add_subdirectory(reload)
+add_subdirectory(restapi)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)

diff --git a/...tests/tests/python-restapi/CMakeLists.txt → systemtests/tests/restapi/CMakeLists.txt b/...tests/tests/python-restapi/CMakeLists.txt → systemtests/tests/restapi/CMakeLists.txt
@@ -22,9 +22,10 @@ check_pymodule_available(3 fastapi)
 check_pymodule_available(3 uvicorn)
 find_program(CURL curl)
 
-# python-restapi-test does not work on installed files and needs some modules
+# restapi does not work on installed files and needs some modules
 if(PYTHON_EXECUTABLE
    AND CURL
+   AND PYTHON
    AND PYMODULE_3_FASTAPI_FOUND
    AND PYMODULE_3_UVICORN_FOUND
    AND NOT RUN_SYSTEMTESTS_ON_INSTALLED_FILES

diff --git a/...tests/tests/python-restapi/api/api.ini.in → systemtests/tests/restapi/api/api.ini.in b/...tests/tests/python-restapi/api/api.ini.in → systemtests/tests/restapi/api/api.ini.in
diff --git a/...sts/tests/python-restapi/api/curl-auth.sh → systemtests/tests/restapi/api/curl-auth.sh b/...sts/tests/python-restapi/api/curl-auth.sh → systemtests/tests/restapi/api/curl-auth.sh
diff --git a/...sts/tests/python-restapi/api/curl-call.sh → systemtests/tests/restapi/api/curl-call.sh b/...sts/tests/python-restapi/api/curl-call.sh → systemtests/tests/restapi/api/curl-call.sh
diff --git a/...tests/tests/python-restapi/api/restapi.sh → systemtests/tests/restapi/api/restapi.sh b/...tests/tests/python-restapi/api/restapi.sh → systemtests/tests/restapi/api/restapi.sh
diff --git a/...tests/python-restapi/environment-local.in → ...mtests/tests/restapi/environment-local.in b/...tests/python-restapi/environment-local.in → ...mtests/tests/restapi/environment-local.in
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/...reos/bareos-dir.d/client/test2-fd.conf.in → ...reos/bareos-dir.d/client/test2-fd.conf.in b/...reos/bareos-dir.d/client/test2-fd.conf.in → ...reos/bareos-dir.d/client/test2-fd.conf.in
diff --git a/...areos/bareos-dir.d/console/admin-tls.conf → ...areos/bareos-dir.d/console/admin-tls.conf b/...areos/bareos-dir.d/console/admin-tls.conf → ...areos/bareos-dir.d/console/admin-tls.conf
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/...pi/etc/bareos/bareos-dir.d/pool/Full.conf → ...pi/etc/bareos/bareos-dir.d/pool/Full.conf b/...pi/etc/bareos/bareos-dir.d/pool/Full.conf → ...pi/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/.../etc/bareos/bareos-dir.d/profile/all.conf → .../etc/bareos/bareos-dir.d/profile/all.conf b/.../etc/bareos/bareos-dir.d/profile/all.conf → .../etc/bareos/bareos-dir.d/profile/all.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/...s/bareos-fd.d/director/bareos-mon.conf.in → ...s/bareos-fd.d/director/bareos-mon.conf.in b/...s/bareos-fd.d/director/bareos-mon.conf.in → ...s/bareos-fd.d/director/bareos-mon.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/...s/bareos-sd.d/director/bareos-mon.conf.in → ...s/bareos-sd.d/director/bareos-mon.conf.in b/...s/bareos-sd.d/director/bareos-mon.conf.in → ...s/bareos-sd.d/director/bareos-mon.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/...api/etc/bareos/bconsole-admin-tls.conf.in → ...api/etc/bareos/bconsole-admin-tls.conf.in b/...api/etc/bareos/bconsole-admin-tls.conf.in → ...api/etc/bareos/bconsole-admin-tls.conf.in
diff --git a/...ython-restapi/etc/bareos/bconsole.conf.in → ...tests/restapi/etc/bareos/bconsole.conf.in b/...ython-restapi/etc/bareos/bconsole.conf.in → ...tests/restapi/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/python-restapi/testrunner → systemtests/tests/restapi/testrunner b/systemtests/tests/python-restapi/testrunner → systemtests/tests/restapi/testrunner
diff --git a/...n-restapi/testrunner_container_centos7.in → ...s/restapi/testrunner_container_centos7.in b/...n-restapi/testrunner_container_centos7.in → ...s/restapi/testrunner_container_centos7.in