From 39345c83acb7a5c4e0ffa3a5958837c6532b5475 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Tue, 26 Jul 2022 18:31:33 +0200
Subject: [PATCH 01/21]  systemtest: rename encrypt-signature-tls-cert

---
 systemtests/tests/CMakeLists.txt                          | 2 +-
 .../CMakeLists.txt                                        | 0
 .../etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in     | 0
 .../etc/bareos/bareos-dir.d/client/bareos-fd.conf.in      | 0
 .../etc/bareos/bareos-dir.d/director/bareos-dir.conf.in   | 0
 .../etc/bareos/bareos-dir.d/fileset/Catalog.conf.in       | 0
 .../etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in      | 0
 .../etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in      | 0
 .../etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf     | 0
 .../etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in    | 0
 .../etc/bareos/bareos-dir.d/messages/Daemon.conf.in       | 0
 .../etc/bareos/bareos-dir.d/messages/Standard.conf.in     | 0
 .../etc/bareos/bareos-dir.d/pool/Differential.conf        | 0
 .../etc/bareos/bareos-dir.d/pool/Full.conf                | 0
 .../etc/bareos/bareos-dir.d/pool/Incremental.conf         | 0
 .../etc/bareos/bareos-dir.d/pool/Scratch.conf             | 0
 .../etc/bareos/bareos-dir.d/profile/operator.conf         | 0
 .../etc/bareos/bareos-dir.d/storage/File.conf.in          | 0
 .../etc/bareos/bareos-fd.d/client/myself.conf.in          | 0
 .../etc/bareos/bareos-fd.d/director/bareos-dir.conf.in    | 0
 .../etc/bareos/bareos-fd.d/messages/Standard.conf         | 0
 .../etc/bareos/bareos-sd.d/device/FileStorage.conf        | 0
 .../etc/bareos/bareos-sd.d/director/bareos-dir.conf.in    | 0
 .../etc/bareos/bareos-sd.d/messages/Standard.conf         | 0
 .../etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in      | 0
 .../etc/bareos/bconsole.conf.in                           | 0
 .../testrunner                                            | 8 ++------
 27 files changed, 3 insertions(+), 7 deletions(-)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/CMakeLists.txt (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/pool/Full.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/profile/operator.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-fd.d/client/myself.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-fd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-sd.d/device/FileStorage.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-sd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/etc/bareos/bconsole.conf.in (100%)
 rename systemtests/tests/{encrypt-signature-tls-cert => tls-certificate-encryption}/testrunner (96%)

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index f33edde3d49..ddb9a4b30c3 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -40,7 +40,6 @@ add_subdirectory(dbcopy-mysql-postgresql)
 add_subdirectory(deprecation)
 add_subdirectory(droplet-s3)
 add_subdirectory(encrypt-signature)
-add_subdirectory(encrypt-signature-tls-cert)
 add_subdirectory(fileset-multiple-blocks)
 add_subdirectory(filesets)
 add_subdirectory(gfapi-fd)
@@ -74,6 +73,7 @@ add_subdirectory(restapi)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)
+add_subdirectory(tls-certificate-encryption)
 add_subdirectory(testfind)
 add_subdirectory(stresstest)
 add_subdirectory(truncate-command)
diff --git a/systemtests/tests/encrypt-signature-tls-cert/CMakeLists.txt b/systemtests/tests/tls-certificate-encryption/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/CMakeLists.txt
rename to systemtests/tests/tls-certificate-encryption/CMakeLists.txt
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bconsole.conf.in b/systemtests/tests/tls-certificate-encryption/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bconsole.conf.in
rename to systemtests/tests/tls-certificate-encryption/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/encrypt-signature-tls-cert/testrunner b/systemtests/tests/tls-certificate-encryption/testrunner
similarity index 96%
rename from systemtests/tests/encrypt-signature-tls-cert/testrunner
rename to systemtests/tests/tls-certificate-encryption/testrunner
index 6d4de716a2d..eabbddec865 100755
--- a/systemtests/tests/encrypt-signature-tls-cert/testrunner
+++ b/systemtests/tests/tls-certificate-encryption/testrunner
@@ -19,8 +19,6 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
-
-
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -33,18 +31,16 @@ messages
 setdebug level=100 storage=File
 label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
+wait
 status director
 status client
 status storage=File
-wait
 messages
 @#
 @# now do a restore
 @#
 @$out $tmp/log2.out
-wait
-restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
-yes
+restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done yes
 wait
 messages
 quit

From c8b044876aa77caea9a8d43197d269c3ce028d46 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 27 Jul 2022 11:19:00 +0200
Subject: [PATCH 02/21] systemtests: separate testnames so they are not
 executed consecutively

---
 systemtests/tests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index ddb9a4b30c3..fd25221bdc4 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -40,6 +40,7 @@ add_subdirectory(dbcopy-mysql-postgresql)
 add_subdirectory(deprecation)
 add_subdirectory(droplet-s3)
 add_subdirectory(encrypt-signature)
+add_subdirectory(tls-certificate-encryption)
 add_subdirectory(fileset-multiple-blocks)
 add_subdirectory(filesets)
 add_subdirectory(gfapi-fd)
@@ -57,7 +58,6 @@ add_subdirectory(py2plug-fd-contrib-bareos_tasks_mysql)
 add_subdirectory(py2plug-fd-ldap)
 add_subdirectory(py2plug-fd-libcloud)
 add_subdirectory(py2plug-fd-local-fileset)
-add_subdirectory(py2plug-fd-local-fileset-restoreobject)
 add_subdirectory(py2plug-fd-mariabackup)
 add_subdirectory(py2plug-fd-ovirt)
 add_subdirectory(py2plug-fd-percona-xtrabackup)
@@ -73,7 +73,6 @@ add_subdirectory(restapi)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)
-add_subdirectory(tls-certificate-encryption)
 add_subdirectory(testfind)
 add_subdirectory(stresstest)
 add_subdirectory(truncate-command)
@@ -81,3 +80,4 @@ add_subdirectory(upgrade-database)
 add_subdirectory(virtualfull)
 add_subdirectory(virtualfull-bscan)
 add_subdirectory(xattr)
+add_subdirectory(py2plug-fd-local-fileset-restoreobject)

From af64d37e82ce70d74e7edc8a3a143746554e28bc Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 12 Aug 2022 11:06:53 +0200
Subject: [PATCH 03/21] systemtest: update scheduler backup test

scheduler
---
 .../bareos-dir.d/schedule/schedule.conf       | 63 -------------------
 systemtests/tests/scheduler-backup/test-setup | 20 +++++-
 .../testrunner-scheduler-backup               |  3 +-
 .../testrunner-scheduler-status-copy-job      | 15 +++--
 4 files changed, 29 insertions(+), 72 deletions(-)
 delete mode 100644 systemtests/tests/scheduler-backup/etc/bareos/bareos-dir.d/schedule/schedule.conf

diff --git a/systemtests/tests/scheduler-backup/etc/bareos/bareos-dir.d/schedule/schedule.conf b/systemtests/tests/scheduler-backup/etc/bareos/bareos-dir.d/schedule/schedule.conf
deleted file mode 100644
index 240185e3316..00000000000
--- a/systemtests/tests/scheduler-backup/etc/bareos/bareos-dir.d/schedule/schedule.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-Schedule {
-  Name = "TestCycle"
-  Run = Level=Full hourly at 0:00
-  Run = Level=Full hourly at 0:01
-  Run = Level=Full hourly at 0:02
-  Run = Level=Full hourly at 0:03
-  Run = Level=Full hourly at 0:04
-  Run = Level=Full hourly at 0:05
-  Run = Level=Full hourly at 0:06
-  Run = Level=Full hourly at 0:07
-  Run = Level=Full hourly at 0:08
-  Run = Level=Full hourly at 0:09
-  Run = Level=Full hourly at 0:10
-  Run = Level=Full hourly at 0:11
-  Run = Level=Full hourly at 0:12
-  Run = Level=Full hourly at 0:13
-  Run = Level=Full hourly at 0:14
-  Run = Level=Full hourly at 0:15
-  Run = Level=Full hourly at 0:16
-  Run = Level=Full hourly at 0:17
-  Run = Level=Full hourly at 0:18
-  Run = Level=Full hourly at 0:19
-  Run = Level=Full hourly at 0:20
-  Run = Level=Full hourly at 0:21
-  Run = Level=Full hourly at 0:22
-  Run = Level=Full hourly at 0:23
-  Run = Level=Full hourly at 0:24
-  Run = Level=Full hourly at 0:25
-  Run = Level=Full hourly at 0:26
-  Run = Level=Full hourly at 0:27
-  Run = Level=Full hourly at 0:28
-  Run = Level=Full hourly at 0:29
-  Run = Level=Full hourly at 0:30
-  Run = Level=Full hourly at 0:31
-  Run = Level=Full hourly at 0:32
-  Run = Level=Full hourly at 0:33
-  Run = Level=Full hourly at 0:34
-  Run = Level=Full hourly at 0:35
-  Run = Level=Full hourly at 0:36
-  Run = Level=Full hourly at 0:37
-  Run = Level=Full hourly at 0:38
-  Run = Level=Full hourly at 0:39
-  Run = Level=Full hourly at 0:40
-  Run = Level=Full hourly at 0:41
-  Run = Level=Full hourly at 0:42
-  Run = Level=Full hourly at 0:43
-  Run = Level=Full hourly at 0:44
-  Run = Level=Full hourly at 0:45
-  Run = Level=Full hourly at 0:46
-  Run = Level=Full hourly at 0:47
-  Run = Level=Full hourly at 0:48
-  Run = Level=Full hourly at 0:49
-  Run = Level=Full hourly at 0:50
-  Run = Level=Full hourly at 0:51
-  Run = Level=Full hourly at 0:52
-  Run = Level=Full hourly at 0:53
-  Run = Level=Full hourly at 0:54
-  Run = Level=Full hourly at 0:55
-  Run = Level=Full hourly at 0:56
-  Run = Level=Full hourly at 0:57
-  Run = Level=Full hourly at 0:58
-  Run = Level=Full hourly at 0:59
-}
diff --git a/systemtests/tests/scheduler-backup/test-setup b/systemtests/tests/scheduler-backup/test-setup
index 3b467ba11f7..30231d4c2bf 100755
--- a/systemtests/tests/scheduler-backup/test-setup
+++ b/systemtests/tests/scheduler-backup/test-setup
@@ -2,7 +2,7 @@
 
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -34,6 +34,24 @@ set -u
 # Fill ${BackupDirectory} with data.
 setup_data
 
+
+# Setup scheduler configuration to run at current time
+if [ $(date +"%S") -ge 50 ]; then
+    sleep 11
+    # to avoid case when we set a scheduled time at for example 13:01 and
+    # before the setup is finished, it becomes 13:02 and schedule doesn't
+    # start. So we give the test extra time to go to the next minute.
+fi
+
+currenttime=$(date +"%H:%M")
+
+[[ -d "${conf}/bareos-dir.d/schedule" ]] || mkdir "${conf}/bareos-dir.d/schedule"
+
+echo "Schedule {
+  Name = \"TestCycle\"
+  Run = Level=Full daily at $currenttime
+}" > "$conf"/bareos-dir.d/schedule/schedule.conf
+
 bin/bareos start
 
 # make sure, director is up and running.
diff --git a/systemtests/tests/scheduler-backup/testrunner-scheduler-backup b/systemtests/tests/scheduler-backup/testrunner-scheduler-backup
index 4f23ee3dc2b..e68285e5a43 100755
--- a/systemtests/tests/scheduler-backup/testrunner-scheduler-backup
+++ b/systemtests/tests/scheduler-backup/testrunner-scheduler-backup
@@ -34,8 +34,7 @@ messages
 @#
 @$out $tmp/log2.out
 wait
-restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
-yes
+restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done yes
 wait
 messages
 quit
diff --git a/systemtests/tests/scheduler-backup/testrunner-scheduler-status-copy-job b/systemtests/tests/scheduler-backup/testrunner-scheduler-status-copy-job
index 15f9bd790e8..d689dab2cfe 100755
--- a/systemtests/tests/scheduler-backup/testrunner-scheduler-status-copy-job
+++ b/systemtests/tests/scheduler-backup/testrunner-scheduler-status-copy-job
@@ -19,13 +19,16 @@ export TestName
 
 start_test
 
+disablelog="$tmp"/disablelog.out
+statuslog="$tmp"/statuslog.out
+
 cat <<END_OF_DATA >$tmp/bconcmds
 messages
-@$out $tmp/log3.out w
+@$out $disablelog
 enable client=bareos-fd
 status scheduler job=copy
 
-@$out $tmp/log4.out w
+@$out $statuslog
 disable client=bareos-fd
 status scheduler job=copy
 wait
@@ -36,14 +39,14 @@ END_OF_DATA
 run_bconsole
 
 #check that `status scheduler job=...` returns scheduled copy jobs
-if ! grep "TestCycle               Level=Full" "$tmp"/log3.out; then
-  echo "No scheduled job was found in $tmp/log3.out, which should contain all scheduled jobs" >&2
+if ! grep "TestCycle               Level=Full" "$disablelog"; then
+  echo "No scheduled jobs were found in $disablelog, which should contain all scheduled jobs" >&2
   estat=1
 fi
 
 #check that `status scheduler job=...` returns nothing when we disable the client
-if  grep "TestCycle               Level=Full" "$tmp"/log4.out; then
-  echo "a scheduled job was listed in $tmp/log4.out, which shouldn't happen" >&2
+if  grep "TestCycle               Level=Full" "$statuslog"; then
+  echo "a scheduled job was listed in $statuslog, which shouldn't happen" >&2
   estat=1
 fi
 

From 2e637506d250cbc0e7bc12f4f5e5998981c0da5e Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 29 Jul 2022 14:03:59 +0200
Subject: [PATCH 04/21] systemtest: fix gfapi systemtest sporadic fails

---
 systemtests/scripts/diff.pl.in        | 4 ++--
 systemtests/tests/gfapi-fd/testrunner | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/systemtests/scripts/diff.pl.in b/systemtests/scripts/diff.pl.in
index df0bdb4745d..058f38c5df5 100755
--- a/systemtests/scripts/diff.pl.in
+++ b/systemtests/scripts/diff.pl.in
@@ -52,7 +52,7 @@ my $md5 = Digest::MD5->new;
 
 my $dir = getcwd;
 
-chdir($src) or die "ERROR: Can't access to $src";
+chdir($src) or die "ERROR: Can't access to $src : $!";
 $hash = \%src_attr;
 find(\&wanted_src, '.');
 
@@ -63,7 +63,7 @@ if ($wattr) {
 
 chdir ($dir);
 
-chdir($dst) or die "ERROR: Can't access to $dst";
+chdir($dst) or die "ERROR: Can't access to $dst : $!";
 $hash = \%dst_attr;
 find(\&wanted_src, '.');
 
diff --git a/systemtests/tests/gfapi-fd/testrunner b/systemtests/tests/gfapi-fd/testrunner
index 3e14f8ff649..c2d7359194e 100755
--- a/systemtests/tests/gfapi-fd/testrunner
+++ b/systemtests/tests/gfapi-fd/testrunner
@@ -35,7 +35,7 @@ while "${SUDO}" mount | grep "${tmp}/data" >/dev/null 2>&1; do
 done
 }
 
-
+trap umount_glusterfs EXIT
 
 #shellcheck source=../scripts/functions
 . "${rscripts}"/functions

From 48cd7acedc98dd2513e2d7cce1a3e584accfc558 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 5 Aug 2022 11:19:57 +0200
Subject: [PATCH 05/21] py2plug-fd tests: stop server after stopping bareos

---
 systemtests/tests/py2plug-fd-mariabackup/testrunner        | 4 ++--
 systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/systemtests/tests/py2plug-fd-mariabackup/testrunner b/systemtests/tests/py2plug-fd-mariabackup/testrunner
index 0a50cc36dc0..4f31bfd76df 100755
--- a/systemtests/tests/py2plug-fd-mariabackup/testrunner
+++ b/systemtests/tests/py2plug-fd-mariabackup/testrunner
@@ -115,11 +115,11 @@ if ! echo "SELECT * from test " | $MYSQL_CLIENT "${mariabackup_test_db}" | grep
     estat=3
 fi
 
-mysql_server_stop
-
 check_for_zombie_jobs storage=File
 stop_bareos
 
+mysql_server_stop
+
 check_two_logs
 
 end_test
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner b/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
index 54023187cd5..0dce7b14e5a 100755
--- a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
+++ b/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
@@ -113,11 +113,12 @@ if ! echo "SELECT * from test " | $MYSQL_CLIENT "${xtrabackup_test_db}" | grep "
     estat=3
 fi
 
-mysql_server_stop
 
 check_for_zombie_jobs storage=File
 stop_bareos
 
+mysql_server_stop
+
 check_two_logs
 
 end_test

From 22883746c8147da7cd8a24c2bbc6e050dc390713 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 12 Aug 2022 11:06:59 +0200
Subject: [PATCH 06/21] systemtests: remove redundant bareos stops

Since the `end_test` function automatically shuts down bareos when it is
a single testrunner, stoping bareos before makes tests try to shutdown
bareos twice which may be causing some sporadic errors
tls
---
 systemtests/tests/acl/testrunner                             | 1 -
 systemtests/tests/bareos-acl/testrunner                      | 2 --
 systemtests/tests/bscan-bextract-bls-bcopy/testrunner        | 2 --
 systemtests/tests/chflags/testrunner                         | 1 -
 systemtests/tests/client-initiated/testrunner                | 2 --
 systemtests/tests/copy-archive-job/testrunner                | 1 -
 systemtests/tests/dbcopy-mysql-postgresql/testrunner         | 1 -
 systemtests/tests/droplet-s3/testrunner                      | 1 -
 systemtests/tests/encrypt-signature/testrunner               | 1 -
 systemtests/tests/filesets/testrunner                        | 1 -
 systemtests/tests/gfapi-fd/testrunner                        | 1 -
 systemtests/tests/glusterfs-backend/testrunner               | 1 -
 systemtests/tests/list-backups/testrunner                    | 1 -
 systemtests/tests/multiplied-device/testrunner               | 1 -
 systemtests/tests/ndmp/testrunner                            | 2 --
 systemtests/tests/notls/testrunner                           | 1 -
 systemtests/tests/passive/testrunner                         | 1 -
 systemtests/tests/pruning/testrunner                         | 1 -
 systemtests/tests/py2plug-dir/testrunner                     | 1 -
 systemtests/tests/py2plug-fd-libcloud/testrunner             | 1 -
 .../tests/py2plug-fd-local-fileset-restoreobject/testrunner  | 4 ----
 systemtests/tests/py2plug-fd-local-fileset/testrunner        | 5 -----
 systemtests/tests/py2plug-fd-mariabackup/testrunner          | 1 -
 systemtests/tests/py2plug-fd-ovirt/testrunner.in             | 1 -
 systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner   | 1 -
 systemtests/tests/py2plug-fd-vmware/testrunner               | 1 -
 systemtests/tests/py2plug-sd/testrunner                      | 1 -
 systemtests/tests/spool/testrunner                           | 1 -
 systemtests/tests/tls-certificate-encryption/CMakeLists.txt  | 2 +-
 systemtests/tests/tls-certificate-encryption/testrunner      | 1 -
 systemtests/tests/truncate-command/testrunner                | 3 ---
 systemtests/tests/virtualfull-bscan/testrunner               | 1 -
 systemtests/tests/virtualfull/testrunner                     | 1 -
 systemtests/tests/xattr/testrunner                           | 1 -
 34 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/systemtests/tests/acl/testrunner b/systemtests/tests/acl/testrunner
index 668eb9559a9..ab445522d07 100755
--- a/systemtests/tests/acl/testrunner
+++ b/systemtests/tests/acl/testrunner
@@ -57,7 +57,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 
diff --git a/systemtests/tests/bareos-acl/testrunner b/systemtests/tests/bareos-acl/testrunner
index ce979829568..afb6528dc13 100755
--- a/systemtests/tests/bareos-acl/testrunner
+++ b/systemtests/tests/bareos-acl/testrunner
@@ -42,6 +42,4 @@ grep -q "status conf: is an invalid command" ${logdir}/acl-status.log || \
 grep -q "eprecated configuration settings detected" ${logdir}/acl-status-conf.log || \
   set_error "acl-status-conf.log"
 
-stop_bareos
-
 end_test
diff --git a/systemtests/tests/bscan-bextract-bls-bcopy/testrunner b/systemtests/tests/bscan-bextract-bls-bcopy/testrunner
index 3bb6def44af..138423ea20e 100755
--- a/systemtests/tests/bscan-bextract-bls-bcopy/testrunner
+++ b/systemtests/tests/bscan-bextract-bls-bcopy/testrunner
@@ -163,8 +163,6 @@ run_bconsole "$tmp/bconcmds2"
 
 check_for_zombie_jobs storage=File
 
-stop_bareos
-
 check_two_logs
 check_restore_diff "${BackupDirectory}"
 end_test
diff --git a/systemtests/tests/chflags/testrunner b/systemtests/tests/chflags/testrunner
index c5507442380..c0e745234a3 100755
--- a/systemtests/tests/chflags/testrunner
+++ b/systemtests/tests/chflags/testrunner
@@ -62,7 +62,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 
diff --git a/systemtests/tests/client-initiated/testrunner b/systemtests/tests/client-initiated/testrunner
index bc19e2467bc..0ac69dd897d 100755
--- a/systemtests/tests/client-initiated/testrunner
+++ b/systemtests/tests/client-initiated/testrunner
@@ -90,8 +90,6 @@ run_bconsole "$tmp/bconcmds"
 
 check_for_zombie_jobs storage=File
 
-stop_bareos
-
 check_two_logs
 check_restore_diff "${BackupDirectory}"
 end_test
diff --git a/systemtests/tests/copy-archive-job/testrunner b/systemtests/tests/copy-archive-job/testrunner
index 9f3eab02a8b..a5d04bf5c77 100755
--- a/systemtests/tests/copy-archive-job/testrunner
+++ b/systemtests/tests/copy-archive-job/testrunner
@@ -58,7 +58,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_sd_files_written $tmp/log2.out
 check_sd_files_written $tmp/log3.out
diff --git a/systemtests/tests/dbcopy-mysql-postgresql/testrunner b/systemtests/tests/dbcopy-mysql-postgresql/testrunner
index f68dcc54b22..920fc7471d8 100755
--- a/systemtests/tests/dbcopy-mysql-postgresql/testrunner
+++ b/systemtests/tests/dbcopy-mysql-postgresql/testrunner
@@ -80,7 +80,6 @@ END_OF_DATA
 
 run_bareos
 check_for_zombie_jobs storage=File client=bareos-fd
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"
diff --git a/systemtests/tests/droplet-s3/testrunner b/systemtests/tests/droplet-s3/testrunner
index 00e275967d8..1d630e611e0 100755
--- a/systemtests/tests/droplet-s3/testrunner
+++ b/systemtests/tests/droplet-s3/testrunner
@@ -55,7 +55,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"
diff --git a/systemtests/tests/encrypt-signature/testrunner b/systemtests/tests/encrypt-signature/testrunner
index 8af731abd02..a4e5a4e4293 100755
--- a/systemtests/tests/encrypt-signature/testrunner
+++ b/systemtests/tests/encrypt-signature/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"
diff --git a/systemtests/tests/filesets/testrunner b/systemtests/tests/filesets/testrunner
index cb80b586379..a0e97e2da1b 100755
--- a/systemtests/tests/filesets/testrunner
+++ b/systemtests/tests/filesets/testrunner
@@ -60,7 +60,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 for i in $TESTS; do
     if ! grep -q $tmp/$i/data2.txt $tmp/estimate-$i.out; then
diff --git a/systemtests/tests/gfapi-fd/testrunner b/systemtests/tests/gfapi-fd/testrunner
index c2d7359194e..a48f28f6e22 100755
--- a/systemtests/tests/gfapi-fd/testrunner
+++ b/systemtests/tests/gfapi-fd/testrunner
@@ -136,7 +136,6 @@ quit
 END_OF_DATA_RESTORE
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 ln -s  "${tmp}" "${tmp}/bareos-restores"
diff --git a/systemtests/tests/glusterfs-backend/testrunner b/systemtests/tests/glusterfs-backend/testrunner
index e92f2afb3a0..8145bddafe9 100755
--- a/systemtests/tests/glusterfs-backend/testrunner
+++ b/systemtests/tests/glusterfs-backend/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/list-backups/testrunner b/systemtests/tests/list-backups/testrunner
index 71981e713b2..83f20e96fa8 100755
--- a/systemtests/tests/list-backups/testrunner
+++ b/systemtests/tests/list-backups/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 echo "Checking list backups for jobtype=backup"
 grep -F '1 | backup-bareos-fd | bareos-fd' "$tmp/list-backups.out"
diff --git a/systemtests/tests/multiplied-device/testrunner b/systemtests/tests/multiplied-device/testrunner
index 47af06ebec4..57da694bdcc 100755
--- a/systemtests/tests/multiplied-device/testrunner
+++ b/systemtests/tests/multiplied-device/testrunner
@@ -85,7 +85,6 @@ quit
 END_OF_DATA
 
 run_bconsole
-stop_bareos
 
 # rename files to be able to run the test again later
 mv ./etc/bareos/bareos-dir.d/storage/fakestorage1.conf_backup ./etc/bareos/bareos-dir.d/storage/fakestorage1.conf
diff --git a/systemtests/tests/ndmp/testrunner b/systemtests/tests/ndmp/testrunner
index 3cb7dce38a9..8f57f9c74df 100755
--- a/systemtests/tests/ndmp/testrunner
+++ b/systemtests/tests/ndmp/testrunner
@@ -165,6 +165,4 @@ cleanup_isilon
 
 check_for_zombie_jobs storage=isilonfile client=bareos-fd
 
-stop_bareos
-
 end_test
diff --git a/systemtests/tests/notls/testrunner b/systemtests/tests/notls/testrunner
index d9522f22012..ca8b9d13580 100755
--- a/systemtests/tests/notls/testrunner
+++ b/systemtests/tests/notls/testrunner
@@ -61,7 +61,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/passive/testrunner b/systemtests/tests/passive/testrunner
index d6956ad6e58..dd02b72323d 100755
--- a/systemtests/tests/passive/testrunner
+++ b/systemtests/tests/passive/testrunner
@@ -51,7 +51,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/pruning/testrunner b/systemtests/tests/pruning/testrunner
index baace395e90..5e2956e1b71 100755
--- a/systemtests/tests/pruning/testrunner
+++ b/systemtests/tests/pruning/testrunner
@@ -157,7 +157,6 @@ END_OF_DATA
 run_bconsole
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 
diff --git a/systemtests/tests/py2plug-dir/testrunner b/systemtests/tests/py2plug-dir/testrunner
index 3bd48571979..323a5fe0678 100755
--- a/systemtests/tests/py2plug-dir/testrunner
+++ b/systemtests/tests/py2plug-dir/testrunner
@@ -53,7 +53,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 for i in bDirEventJobStart bDirEventJobInit bDirEventJobRun bDirEventJobEnd; do
   if ! grep -q "$i" ${tmp}/test-plugin1.log; then
diff --git a/systemtests/tests/py2plug-fd-libcloud/testrunner b/systemtests/tests/py2plug-fd-libcloud/testrunner
index d51d3cd0412..7a24d3cac0e 100755
--- a/systemtests/tests/py2plug-fd-libcloud/testrunner
+++ b/systemtests/tests/py2plug-fd-libcloud/testrunner
@@ -99,7 +99,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 list=( $(find "${BackupDirectory}" -type f) )
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
index 8d73dd9febe..5156896adcc 100755
--- a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
+++ b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
@@ -26,9 +26,6 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
-
-
-
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -62,7 +59,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 list=( $(find "${BackupDirectory}" -type f) )
diff --git a/systemtests/tests/py2plug-fd-local-fileset/testrunner b/systemtests/tests/py2plug-fd-local-fileset/testrunner
index 67c6f19e68e..0c25ff01344 100755
--- a/systemtests/tests/py2plug-fd-local-fileset/testrunner
+++ b/systemtests/tests/py2plug-fd-local-fileset/testrunner
@@ -26,9 +26,6 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
-
-
-
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -65,7 +62,6 @@ fi
 check_for_zombie_jobs storage=File
 stop_bareos
 
-
 cat <<END_OF_DATA >$tmp/bconcmds
 @#
 @# now do a restore
@@ -79,7 +75,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/py2plug-fd-mariabackup/testrunner b/systemtests/tests/py2plug-fd-mariabackup/testrunner
index 4f31bfd76df..2784de64273 100755
--- a/systemtests/tests/py2plug-fd-mariabackup/testrunner
+++ b/systemtests/tests/py2plug-fd-mariabackup/testrunner
@@ -116,7 +116,6 @@ if ! echo "SELECT * from test " | $MYSQL_CLIENT "${mariabackup_test_db}" | grep
 fi
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 mysql_server_stop
 
diff --git a/systemtests/tests/py2plug-fd-ovirt/testrunner.in b/systemtests/tests/py2plug-fd-ovirt/testrunner.in
index 964f41b7d8d..9e099a135cb 100755
--- a/systemtests/tests/py2plug-fd-ovirt/testrunner.in
+++ b/systemtests/tests/py2plug-fd-ovirt/testrunner.in
@@ -50,7 +50,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner b/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
index 0dce7b14e5a..2f79ffa45e9 100755
--- a/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
+++ b/systemtests/tests/py2plug-fd-percona-xtrabackup/testrunner
@@ -115,7 +115,6 @@ fi
 
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 mysql_server_stop
 
diff --git a/systemtests/tests/py2plug-fd-vmware/testrunner b/systemtests/tests/py2plug-fd-vmware/testrunner
index 06b2572786f..f80846a6961 100755
--- a/systemtests/tests/py2plug-fd-vmware/testrunner
+++ b/systemtests/tests/py2plug-fd-vmware/testrunner
@@ -65,7 +65,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 
diff --git a/systemtests/tests/py2plug-sd/testrunner b/systemtests/tests/py2plug-sd/testrunner
index 07b2cc361bf..33416aeca1d 100755
--- a/systemtests/tests/py2plug-sd/testrunner
+++ b/systemtests/tests/py2plug-sd/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 events=(bsdEventJobStart
 bsdEventDeviceReserve
diff --git a/systemtests/tests/spool/testrunner b/systemtests/tests/spool/testrunner
index 6d4de716a2d..63153c83314 100755
--- a/systemtests/tests/spool/testrunner
+++ b/systemtests/tests/spool/testrunner
@@ -52,7 +52,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/tls-certificate-encryption/CMakeLists.txt b/systemtests/tests/tls-certificate-encryption/CMakeLists.txt
index cfd54bc5868..2a79b7f8aea 100644
--- a/systemtests/tests/tls-certificate-encryption/CMakeLists.txt
+++ b/systemtests/tests/tls-certificate-encryption/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/systemtests/tests/tls-certificate-encryption/testrunner b/systemtests/tests/tls-certificate-encryption/testrunner
index eabbddec865..4fac6a3de67 100755
--- a/systemtests/tests/tls-certificate-encryption/testrunner
+++ b/systemtests/tests/tls-certificate-encryption/testrunner
@@ -48,7 +48,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff ${BackupDirectory}
diff --git a/systemtests/tests/truncate-command/testrunner b/systemtests/tests/truncate-command/testrunner
index 3255543e820..d6de21df028 100755
--- a/systemtests/tests/truncate-command/testrunner
+++ b/systemtests/tests/truncate-command/testrunner
@@ -70,9 +70,6 @@ run_bconsole ${tmp}/bconcmds2
 # verify that all are terminated
 check_for_zombie_jobs storage=File1 client=${Client}
 
-# stop bareos
-stop_bareos
-
 # check tmp/log1.out and tmp/log2.out for errors
 check_two_logs
 
diff --git a/systemtests/tests/virtualfull-bscan/testrunner b/systemtests/tests/virtualfull-bscan/testrunner
index 9953227158c..2564a9e80fd 100755
--- a/systemtests/tests/virtualfull-bscan/testrunner
+++ b/systemtests/tests/virtualfull-bscan/testrunner
@@ -128,7 +128,6 @@ END_OF_DATA
 run_bconsole "$tmp/bconcmds2"
 
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 check_restore_diff "${BackupDirectory}"
diff --git a/systemtests/tests/virtualfull/testrunner b/systemtests/tests/virtualfull/testrunner
index 98ea747d7e3..73adbf6fb36 100755
--- a/systemtests/tests/virtualfull/testrunner
+++ b/systemtests/tests/virtualfull/testrunner
@@ -119,7 +119,6 @@ END_OF_DATA
 run_bconsole "$tmp/bconcmds3"
 check_for_zombie_jobs storage=File
 check_two_logs
-stop_bareos
 
 if ! grep -q "Consolidating JobIds 1,2 containing 74 files" "$tmp/log1.out"; then
   echo "Consolidation message was not emitted" >&2
diff --git a/systemtests/tests/xattr/testrunner b/systemtests/tests/xattr/testrunner
index 88b7a225475..1387ca19f17 100755
--- a/systemtests/tests/xattr/testrunner
+++ b/systemtests/tests/xattr/testrunner
@@ -62,7 +62,6 @@ END_OF_DATA
 
 run_bareos "$@"
 check_for_zombie_jobs storage=File
-stop_bareos
 
 check_two_logs
 

From ae399de56995bd77682d0721cb7ae8545808eab6 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Mon, 8 Aug 2022 10:19:41 +0200
Subject: [PATCH 07/21] commandline test: remove unnecessary autxflate from
 commandline test

---
 .../etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in  | 11 -----------
 .../etc/bareos/bareos-sd.d/device/FileStorage.conf    |  4 ----
 .../etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in  |  2 --
 3 files changed, 17 deletions(-)
 delete mode 100644 systemtests/tests/commandline-options/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in

diff --git a/systemtests/tests/commandline-options/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/commandline-options/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
deleted file mode 100644
index 89256864d9a..00000000000
--- a/systemtests/tests/commandline-options/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/commandline-options/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/device/FileStorage.conf
index 61463cb612c..11a639bc688 100644
--- a/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/device/FileStorage.conf
+++ b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/device/FileStorage.conf
@@ -8,8 +8,4 @@ Device {
   RemovableMedia = no;
   AlwaysOpen = no;
   Description = "File device. A connecting Director must have the same Name and MediaType."
-  Auto Inflate = both
-  Auto Deflate = both
-  Auto Deflate Algorithm = gzip
-
 }
diff --git a/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 5dc406dcad2..d555776e07e 100644
--- a/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -6,8 +6,6 @@ Storage {
   # if "Plugin Names" is defined, only the specified plugins will be loaded,
   # otherwise all storage plugins (*-sd.so) from the "Plugin Directory".
   #
-  Plugin Directory = "@SD_PLUGINS_DIR_TO_TEST@"
-  Plugin Names = "autoxflate"
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
 }

From 2e059da67d7fc2b02ea615e42d94d5b8df66e32c Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Tue, 9 Aug 2022 13:00:34 +0200
Subject: [PATCH 08/21] scripts/functions: introduce wait_for_jobs_to_terminate

(cherry picked from commit f5d50c878cbe1d02735406272569f8cd033dda87)

status what

(cherry picked from commit d10fde771f00c50cd5d289c0d28d2af027d4d98b)
---
 systemtests/scripts/functions | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/systemtests/scripts/functions b/systemtests/scripts/functions
index a30475e5b15..edc8916a70d 100644
--- a/systemtests/scripts/functions
+++ b/systemtests/scripts/functions
@@ -3,6 +3,20 @@
 # A set of useful functions to be sourced in each test
 #
 
+wait_for_jobs_to_terminate ()
+{
+  status_of_what=$1
+  max_wait_in_seconds=$2
+  count=max_wait_in_seconds
+  while (( --count >= 0 )); do
+    if  "${BAREOS_BCONSOLE_BINARY}" -c "${conf}" <<< "status ${status_of_what}" | grep "No Jobs running.";
+    then
+      break
+    fi
+    sleep 1
+  done
+}
+
 copy_configs()
 {
     COMPONENTS="bareos-dir bareos-sd bareos-fd bconsole tray-monitor"

From 1c4599d14a8ae7f78f9153004488e0b42abaa33f Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 12 Aug 2022 11:06:45 +0200
Subject: [PATCH 09/21] use bash

(cherry picked from commit 6a2077ca9aa7b2eb103e20e3b87845db2a397183)
---
 systemtests/scripts/check_for_zombie_jobs                     | 2 +-
 systemtests/scripts/cleanup                                   | 2 +-
 systemtests/scripts/setup                                     | 2 +-
 .../tests/bconsole-pam/bin/check_pam_exec_available.sh        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/systemtests/scripts/check_for_zombie_jobs b/systemtests/scripts/check_for_zombie_jobs
index 96fc9c8bc8b..01aeb7e18cf 100755
--- a/systemtests/scripts/check_for_zombie_jobs
+++ b/systemtests/scripts/check_for_zombie_jobs
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Check for zombie jobs (not terminated).
 # Also scan logs for ERROR messages
diff --git a/systemtests/scripts/cleanup b/systemtests/scripts/cleanup
index 732f0dde96a..f42bbf904cc 100755
--- a/systemtests/scripts/cleanup
+++ b/systemtests/scripts/cleanup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -u
 
 #shellcheck source=../environment.in
diff --git a/systemtests/scripts/setup b/systemtests/scripts/setup
index 0bbc8bdb5c2..b4145cb83d4 100755
--- a/systemtests/scripts/setup
+++ b/systemtests/scripts/setup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #shellcheck source=../environment.in
 . ./environment
 . "${rscripts}/functions"
diff --git a/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh b/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
index 3a609cb29ea..7f6a673f257 100755
--- a/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
+++ b/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public

From 99f70e20b49322bc611bdfc508e7c7b7d3bc8a4e Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Mon, 8 Aug 2022 11:16:12 +0200
Subject: [PATCH 10/21] check_for_zombie_jobs: add wait for running jobs to
 zombie job check

---
 systemtests/scripts/check_for_zombie_jobs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/systemtests/scripts/check_for_zombie_jobs b/systemtests/scripts/check_for_zombie_jobs
index 01aeb7e18cf..b8cd57cb194 100755
--- a/systemtests/scripts/check_for_zombie_jobs
+++ b/systemtests/scripts/check_for_zombie_jobs
@@ -15,6 +15,8 @@ else
     client="client"
 fi
 
+wait_for_jobs_to_terminate "${client}" 20
+
 "${BAREOS_BCONSOLE_BINARY}" -c "${conf}" <<END_OF_DATA >/dev/null 2>&1
 @output "${tmp}"/dir.out
 status dir

From a6f0f8376ffce07e9945c552026ae2d6ba93032c Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 12 Aug 2022 11:06:37 +0200
Subject: [PATCH 11/21] gtest: try binding six times

gtest: explicit bind error message


test sockets
---
 core/src/tests/bareos_test_sockets.cc | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/core/src/tests/bareos_test_sockets.cc b/core/src/tests/bareos_test_sockets.cc
index b51e61d36b7..a2096a625de 100644
--- a/core/src/tests/bareos_test_sockets.cc
+++ b/core/src/tests/bareos_test_sockets.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2018-2020 Bareos GmbH & Co. KG
+   Copyright (C) 2018-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -28,9 +28,10 @@
 
 #include "bareos_test_sockets.h"
 #include "tests/bsock_test.h"
-
 #include "lib/bsock_tcp.h"
 
+#include <thread>
+
 #if HAVE_WIN32
 #  include <cstdlib>
 #  include <mutex>
@@ -78,9 +79,21 @@ static int create_listening_server_socket(int port)
   address.sin_family = AF_INET;
   address.sin_addr.s_addr = INADDR_ANY;
   address.sin_port = htons(port);
-  if (bind(listen_file_descriptor, (struct sockaddr*)&address, sizeof(address))
-      < 0) {
-    perror("bind failed");
+
+  int bindresult = -1;
+  for (int i = 0; i < 6; i++) {
+    bindresult = bind(listen_file_descriptor, (struct sockaddr*)&address,
+                      sizeof(address));
+    if (bindresult == 0) {
+      break;
+    } else {
+      std::this_thread::sleep_for(std::chrono::seconds(2));
+    }
+  }
+  std::string errormessage{"bind failed for port "};
+  errormessage.append(std::to_string(port));
+  if (bindresult < 0) {
+    perror(errormessage.c_str());
     return -4;
   }
 

From 4feef9a0f5f67bc285ea698d50bf0585cc8bb88b Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Tue, 9 Aug 2022 13:01:19 +0200
Subject: [PATCH 12/21] gtest: try to listen 6 times

---
 core/src/tests/bareos_test_sockets.cc     | 12 ++++++++++--
 systemtests/scripts/check_for_zombie_jobs |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/tests/bareos_test_sockets.cc b/core/src/tests/bareos_test_sockets.cc
index a2096a625de..8082f8457d1 100644
--- a/core/src/tests/bareos_test_sockets.cc
+++ b/core/src/tests/bareos_test_sockets.cc
@@ -118,8 +118,16 @@ static int create_listening_server_socket(int port)
     perror("setsockopt");
     return -5;
   }
-
-  if (listen(listen_file_descriptor, 3) < 0) {
+  int listenresult = -1;
+  for (int i = 0; i < 6; i++) {
+    listenresult = listen(listen_file_descriptor, 3);
+    if (listenresult == 0) {
+      break;
+    } else {
+      std::this_thread::sleep_for(std::chrono::seconds(2));
+    }
+  }
+  if (listenresult < 0) {
     perror("listen");
     return -6;
   }
diff --git a/systemtests/scripts/check_for_zombie_jobs b/systemtests/scripts/check_for_zombie_jobs
index b8cd57cb194..b52209e725a 100755
--- a/systemtests/scripts/check_for_zombie_jobs
+++ b/systemtests/scripts/check_for_zombie_jobs
@@ -7,6 +7,9 @@
 # shellcheck source=../environment.in
 . ./environment
 
+# shellcheck source= ./functions
+. "${rscripts}"/functions
+
 # check_for_zombie_jobs storage=STORAGE [client=localhost-fd]
 
 if [ $# = 2 ] ; then

From 05c241c905eb636882372c683b46d97bec7f5d0f Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 12 Aug 2022 11:13:23 +0200
Subject: [PATCH 13/21] Updated CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 629dc225efc..1b6d33012ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - dird: fix odd-even weeks parsing bug in schedule [PR #1210]
 - bcopy: fix crash in bcopy when using certain cli arguments [PR #1211]
 - webui: fix password string length limitation [BUG #1480][PR #1251]
+- systemtest: fixed issues with systemtests not succeeding on first try [PR #1186]
 
 ### Changed
 - contrib: rename Python modules to satisfy PEP8 [PR #768]

From 1b721b1298fd01b2ad1cdcb1e6f2797834ef9072 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 7 Sep 2022 16:47:53 +0200
Subject: [PATCH 14/21] gtest: added log for bind and listen tries

---
 core/src/tests/bareos_test_sockets.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/tests/bareos_test_sockets.cc b/core/src/tests/bareos_test_sockets.cc
index 8082f8457d1..aa270377f1a 100644
--- a/core/src/tests/bareos_test_sockets.cc
+++ b/core/src/tests/bareos_test_sockets.cc
@@ -85,6 +85,7 @@ static int create_listening_server_socket(int port)
     bindresult = bind(listen_file_descriptor, (struct sockaddr*)&address,
                       sizeof(address));
     if (bindresult == 0) {
+      std::cout << "bind successful after " << i + 1 << " tries" << std::endl;
       break;
     } else {
       std::this_thread::sleep_for(std::chrono::seconds(2));
@@ -122,6 +123,7 @@ static int create_listening_server_socket(int port)
   for (int i = 0; i < 6; i++) {
     listenresult = listen(listen_file_descriptor, 3);
     if (listenresult == 0) {
+      std::cout << "listen successful after " << i + 1 << " tries" << std::endl;
       break;
     } else {
       std::this_thread::sleep_for(std::chrono::seconds(2));

From 14b80d765e09efad25d0bf4acfe1cd1ccc3ccbba Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 27 Jul 2022 11:19:00 +0200
Subject: [PATCH 15/21] Revert "systemtests: separate testnames so they are not
 executed consecutively"

This reverts commit d382baf82d8f648d0b441b8f11eac450997c7bcb.
---
 systemtests/tests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index fd25221bdc4..ddb9a4b30c3 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -40,7 +40,6 @@ add_subdirectory(dbcopy-mysql-postgresql)
 add_subdirectory(deprecation)
 add_subdirectory(droplet-s3)
 add_subdirectory(encrypt-signature)
-add_subdirectory(tls-certificate-encryption)
 add_subdirectory(fileset-multiple-blocks)
 add_subdirectory(filesets)
 add_subdirectory(gfapi-fd)
@@ -58,6 +57,7 @@ add_subdirectory(py2plug-fd-contrib-bareos_tasks_mysql)
 add_subdirectory(py2plug-fd-ldap)
 add_subdirectory(py2plug-fd-libcloud)
 add_subdirectory(py2plug-fd-local-fileset)
+add_subdirectory(py2plug-fd-local-fileset-restoreobject)
 add_subdirectory(py2plug-fd-mariabackup)
 add_subdirectory(py2plug-fd-ovirt)
 add_subdirectory(py2plug-fd-percona-xtrabackup)
@@ -73,6 +73,7 @@ add_subdirectory(restapi)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)
+add_subdirectory(tls-certificate-encryption)
 add_subdirectory(testfind)
 add_subdirectory(stresstest)
 add_subdirectory(truncate-command)
@@ -80,4 +81,3 @@ add_subdirectory(upgrade-database)
 add_subdirectory(virtualfull)
 add_subdirectory(virtualfull-bscan)
 add_subdirectory(xattr)
-add_subdirectory(py2plug-fd-local-fileset-restoreobject)

From 4400a0f667cd45a46f4fa0e9a4317281403b0771 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Tue, 26 Jul 2022 18:31:33 +0200
Subject: [PATCH 16/21] Revert " systemtest: rename encrypt-signature-tls-cert"

This reverts commit 470bf7612f97d5002ba77a53e8aa763e0ebaa8f5.
---
 systemtests/tests/CMakeLists.txt                          | 2 +-
 .../CMakeLists.txt                                        | 0
 .../etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in     | 0
 .../etc/bareos/bareos-dir.d/client/bareos-fd.conf.in      | 0
 .../etc/bareos/bareos-dir.d/director/bareos-dir.conf.in   | 0
 .../etc/bareos/bareos-dir.d/fileset/Catalog.conf.in       | 0
 .../etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in      | 0
 .../etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in      | 0
 .../etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf     | 0
 .../etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in    | 0
 .../etc/bareos/bareos-dir.d/messages/Daemon.conf.in       | 0
 .../etc/bareos/bareos-dir.d/messages/Standard.conf.in     | 0
 .../etc/bareos/bareos-dir.d/pool/Differential.conf        | 0
 .../etc/bareos/bareos-dir.d/pool/Full.conf                | 0
 .../etc/bareos/bareos-dir.d/pool/Incremental.conf         | 0
 .../etc/bareos/bareos-dir.d/pool/Scratch.conf             | 0
 .../etc/bareos/bareos-dir.d/profile/operator.conf         | 0
 .../etc/bareos/bareos-dir.d/storage/File.conf.in          | 0
 .../etc/bareos/bareos-fd.d/client/myself.conf.in          | 0
 .../etc/bareos/bareos-fd.d/director/bareos-dir.conf.in    | 0
 .../etc/bareos/bareos-fd.d/messages/Standard.conf         | 0
 .../etc/bareos/bareos-sd.d/device/FileStorage.conf        | 0
 .../etc/bareos/bareos-sd.d/director/bareos-dir.conf.in    | 0
 .../etc/bareos/bareos-sd.d/messages/Standard.conf         | 0
 .../etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in      | 0
 .../etc/bareos/bconsole.conf.in                           | 0
 .../testrunner                                            | 8 ++++++--
 27 files changed, 7 insertions(+), 3 deletions(-)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/CMakeLists.txt (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/pool/Full.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/profile/operator.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-fd.d/client/myself.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-fd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-sd.d/device/FileStorage.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-sd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/etc/bareos/bconsole.conf.in (100%)
 rename systemtests/tests/{tls-certificate-encryption => encrypt-signature-tls-cert}/testrunner (96%)

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index ddb9a4b30c3..f33edde3d49 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -40,6 +40,7 @@ add_subdirectory(dbcopy-mysql-postgresql)
 add_subdirectory(deprecation)
 add_subdirectory(droplet-s3)
 add_subdirectory(encrypt-signature)
+add_subdirectory(encrypt-signature-tls-cert)
 add_subdirectory(fileset-multiple-blocks)
 add_subdirectory(filesets)
 add_subdirectory(gfapi-fd)
@@ -73,7 +74,6 @@ add_subdirectory(restapi)
 add_subdirectory(scheduler-backup)
 add_subdirectory(sparse-file)
 add_subdirectory(spool)
-add_subdirectory(tls-certificate-encryption)
 add_subdirectory(testfind)
 add_subdirectory(stresstest)
 add_subdirectory(truncate-command)
diff --git a/systemtests/tests/tls-certificate-encryption/CMakeLists.txt b/systemtests/tests/encrypt-signature-tls-cert/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/CMakeLists.txt
rename to systemtests/tests/encrypt-signature-tls-cert/CMakeLists.txt
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/etc/bareos/bconsole.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/tls-certificate-encryption/etc/bareos/bconsole.conf.in
rename to systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/tls-certificate-encryption/testrunner b/systemtests/tests/encrypt-signature-tls-cert/testrunner
similarity index 96%
rename from systemtests/tests/tls-certificate-encryption/testrunner
rename to systemtests/tests/encrypt-signature-tls-cert/testrunner
index 4fac6a3de67..63153c83314 100755
--- a/systemtests/tests/tls-certificate-encryption/testrunner
+++ b/systemtests/tests/encrypt-signature-tls-cert/testrunner
@@ -19,6 +19,8 @@ JobName=backup-bareos-fd
 "${rscripts}"/cleanup
 "${rscripts}"/setup
 
+
+
 # Fill ${BackupDirectory} with data.
 setup_data
 
@@ -31,16 +33,18 @@ messages
 setdebug level=100 storage=File
 label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
-wait
 status director
 status client
 status storage=File
+wait
 messages
 @#
 @# now do a restore
 @#
 @$out $tmp/log2.out
-restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done yes
+wait
+restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
+yes
 wait
 messages
 quit

From 027d8cdd396df8affb35597d941984656d8a7c93 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Tue, 13 Sep 2022 09:49:25 +0200
Subject: [PATCH 17/21] rmeove extra waits

---
 systemtests/tests/encrypt-signature-tls-cert/testrunner       | 4 +---
 systemtests/tests/encrypt-signature/testrunner                | 4 +---
 .../tests/py2plug-fd-local-fileset-restoreobject/testrunner   | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/systemtests/tests/encrypt-signature-tls-cert/testrunner b/systemtests/tests/encrypt-signature-tls-cert/testrunner
index 63153c83314..8cff8693025 100755
--- a/systemtests/tests/encrypt-signature-tls-cert/testrunner
+++ b/systemtests/tests/encrypt-signature-tls-cert/testrunner
@@ -42,9 +42,7 @@ messages
 @# now do a restore
 @#
 @$out $tmp/log2.out
-wait
-restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
-yes
+restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done yes
 wait
 messages
 quit
diff --git a/systemtests/tests/encrypt-signature/testrunner b/systemtests/tests/encrypt-signature/testrunner
index a4e5a4e4293..21f3e36f599 100755
--- a/systemtests/tests/encrypt-signature/testrunner
+++ b/systemtests/tests/encrypt-signature/testrunner
@@ -42,9 +42,7 @@ messages
 @# now do a restore
 @#
 @$out $tmp/log2.out
-wait
-restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done
-yes
+restore client=bareos-fd fileset=SelfTest where=$tmp/bareos-restores select all done yes
 wait
 messages
 quit
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
index 5156896adcc..3d2ebdea159 100755
--- a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
+++ b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/testrunner
@@ -50,7 +50,6 @@ messages
 @# now do a restore
 @#
 @$out $tmp/log2.out
-wait
 restore client=bareos-fd fileset=PluginTest where=$tmp/bareos-restores select all done yes
 status client=bareos-fd
 wait

From 556dc12cc2ed3142ee01a543f1cf7265ec40d67d Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 14 Sep 2022 12:37:37 +0200
Subject: [PATCH 18/21] bareos-ctl-funcs: select first occurrence of the
 basename

---
 core/scripts/bareos-ctl-funcs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/scripts/bareos-ctl-funcs b/core/scripts/bareos-ctl-funcs
index c6b0de87823..8b7697af2ed 100755
--- a/core/scripts/bareos-ctl-funcs
+++ b/core/scripts/bareos-ctl-funcs
@@ -25,13 +25,13 @@ pidofproc() {
    if [ ! -z "${PGREP}" -a -x "${PGREP}" ] ; then
       pid=`${PGREP} -f $base`
       if [ "$pid" != "" ] ; then
-         echo $pid
+         echo $pid | cut -d' ' -f 1
          return 0
       fi
    fi
 
    # Finally try to extract it from ps
-   pid=`${PSCMD} | grep $base | ${AWK} '{ print $1 }' | tr '\n' ' '`
+   pid=`${PSCMD} | grep -m 1 $base | ${AWK} '{ print $1 }' | tr '\n' ' '`
    echo $pid
    return 0
 }

From 256ce17068f622e941cbd8ca38b6d65e096b8c4b Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 14 Sep 2022 11:45:16 +0200
Subject: [PATCH 19/21] rename `encrypt-signature`

---
 systemtests/tests/CMakeLists.txt                                | 2 +-
 .../CMakeLists.txt                                              | 0
 .../etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in           | 0
 .../etc/bareos/bareos-dir.d/client/bareos-fd.conf.in            | 0
 .../etc/bareos/bareos-dir.d/director/bareos-dir.conf.in         | 0
 .../etc/bareos/bareos-dir.d/fileset/Catalog.conf.in             | 0
 .../etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in            | 0
 .../etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in            | 0
 .../etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf           | 0
 .../etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in          | 0
 .../etc/bareos/bareos-dir.d/messages/Daemon.conf.in             | 0
 .../etc/bareos/bareos-dir.d/messages/Standard.conf.in           | 0
 .../etc/bareos/bareos-dir.d/pool/Differential.conf              | 0
 .../etc/bareos/bareos-dir.d/pool/Full.conf                      | 0
 .../etc/bareos/bareos-dir.d/pool/Incremental.conf               | 0
 .../etc/bareos/bareos-dir.d/pool/Scratch.conf                   | 0
 .../etc/bareos/bareos-dir.d/profile/operator.conf               | 0
 .../etc/bareos/bareos-dir.d/storage/File.conf.in                | 0
 .../etc/bareos/bareos-fd.d/client/myself.conf.in                | 0
 .../etc/bareos/bareos-fd.d/director/bareos-dir.conf.in          | 0
 .../etc/bareos/bareos-fd.d/messages/Standard.conf               | 0
 .../etc/bareos/bareos-sd.d/device/FileStorage.conf              | 0
 .../etc/bareos/bareos-sd.d/director/bareos-dir.conf.in          | 0
 .../etc/bareos/bareos-sd.d/messages/Standard.conf               | 0
 .../etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in            | 0
 .../etc/bareos/bconsole.conf.in                                 | 0
 .../{encrypt-signature => encrypt-signature-no-tls}/testrunner  | 0
 27 files changed, 1 insertion(+), 1 deletion(-)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/CMakeLists.txt (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/pool/Full.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/profile/operator.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-fd.d/client/myself.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-fd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-sd.d/device/FileStorage.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-sd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/etc/bareos/bconsole.conf.in (100%)
 rename systemtests/tests/{encrypt-signature => encrypt-signature-no-tls}/testrunner (100%)

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index f33edde3d49..380e529189a 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -39,7 +39,7 @@ add_subdirectory(copy-remote-bscan)
 add_subdirectory(dbcopy-mysql-postgresql)
 add_subdirectory(deprecation)
 add_subdirectory(droplet-s3)
-add_subdirectory(encrypt-signature)
+add_subdirectory(encrypt-signature-no-tls)
 add_subdirectory(encrypt-signature-tls-cert)
 add_subdirectory(fileset-multiple-blocks)
 add_subdirectory(filesets)
diff --git a/systemtests/tests/encrypt-signature/CMakeLists.txt b/systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt
similarity index 100%
rename from systemtests/tests/encrypt-signature/CMakeLists.txt
rename to systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/encrypt-signature/etc/bareos/bconsole.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/encrypt-signature/etc/bareos/bconsole.conf.in
rename to systemtests/tests/encrypt-signature-no-tls/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/encrypt-signature/testrunner b/systemtests/tests/encrypt-signature-no-tls/testrunner
similarity index 100%
rename from systemtests/tests/encrypt-signature/testrunner
rename to systemtests/tests/encrypt-signature-no-tls/testrunner

From 96a7d4661dc4782d5b8c745793cc705d8e5cc3a9 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Wed, 14 Sep 2022 12:00:41 +0200
Subject: [PATCH 20/21] rename `py2plug-fd-local-fileset` to
 `py2plug-fd-fileset-basic`

---
 systemtests/tests/CMakeLists.txt                       |  2 +-
 .../CMakeLists.txt                                     | 10 +++++-----
 .../etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in  |  0
 .../etc/bareos/bareos-dir.d/client/bareos-fd.conf.in   |  0
 .../bareos/bareos-dir.d/director/bareos-dir.conf.in    |  0
 .../etc/bareos/bareos-dir.d/fileset/Catalog.conf.in    |  0
 .../etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in |  0
 .../etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in   |  0
 .../etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in   |  0
 .../etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf  |  0
 .../etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in |  0
 .../etc/bareos/bareos-dir.d/messages/Daemon.conf.in    |  0
 .../etc/bareos/bareos-dir.d/messages/Standard.conf.in  |  0
 .../etc/bareos/bareos-dir.d/pool/Differential.conf     |  0
 .../etc/bareos/bareos-dir.d/pool/Full.conf             |  0
 .../etc/bareos/bareos-dir.d/pool/Incremental.conf      |  0
 .../etc/bareos/bareos-dir.d/pool/Scratch.conf          |  0
 .../etc/bareos/bareos-dir.d/profile/operator.conf      |  0
 .../etc/bareos/bareos-dir.d/storage/File.conf.in       |  0
 .../etc/bareos/bareos-fd.d/client/myself.conf.in       |  0
 .../etc/bareos/bareos-fd.d/director/bareos-dir.conf.in |  0
 .../etc/bareos/bareos-fd.d/messages/Standard.conf      |  0
 .../etc/bareos/bareos-sd.d/device/FileStorage.conf     |  0
 .../etc/bareos/bareos-sd.d/director/bareos-dir.conf.in |  0
 .../etc/bareos/bareos-sd.d/messages/Standard.conf      |  0
 .../etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in   |  0
 .../etc/bareos/bconsole.conf.in                        |  0
 .../python-modules/BareosFdPluginLocalFileset.py       |  0
 .../python-modules/bareos-fd-local-fileset.py          |  0
 .../testrunner                                         |  0
 systemtests/tests/py3plug-fd-local-fileset             |  1 -
 systemtests/tests/py3plug-fd-local-fileset-basic       |  1 +
 32 files changed, 7 insertions(+), 7 deletions(-)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/CMakeLists.txt (90%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/messages/Daemon.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/messages/Standard.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/pool/Differential.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/pool/Full.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/pool/Incremental.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/pool/Scratch.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/profile/operator.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-dir.d/storage/File.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-fd.d/client/myself.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-fd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-sd.d/device/FileStorage.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-sd.d/messages/Standard.conf (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/etc/bareos/bconsole.conf.in (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/python-modules/BareosFdPluginLocalFileset.py (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/python-modules/bareos-fd-local-fileset.py (100%)
 rename systemtests/tests/{py2plug-fd-local-fileset => py2plug-fd-local-fileset-basic}/testrunner (100%)
 delete mode 120000 systemtests/tests/py3plug-fd-local-fileset
 create mode 120000 systemtests/tests/py3plug-fd-local-fileset-basic

diff --git a/systemtests/tests/CMakeLists.txt b/systemtests/tests/CMakeLists.txt
index 380e529189a..b7504d7969a 100644
--- a/systemtests/tests/CMakeLists.txt
+++ b/systemtests/tests/CMakeLists.txt
@@ -57,7 +57,7 @@ add_subdirectory(py2plug-dir)
 add_subdirectory(py2plug-fd-contrib-bareos_tasks_mysql)
 add_subdirectory(py2plug-fd-ldap)
 add_subdirectory(py2plug-fd-libcloud)
-add_subdirectory(py2plug-fd-local-fileset)
+add_subdirectory(py2plug-fd-local-fileset-basic)
 add_subdirectory(py2plug-fd-local-fileset-restoreobject)
 add_subdirectory(py2plug-fd-mariabackup)
 add_subdirectory(py2plug-fd-ovirt)
diff --git a/systemtests/tests/py2plug-fd-local-fileset/CMakeLists.txt b/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
similarity index 90%
rename from systemtests/tests/py2plug-fd-local-fileset/CMakeLists.txt
rename to systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
index f9c516a7d44..2b404000a04 100644
--- a/systemtests/tests/py2plug-fd-local-fileset/CMakeLists.txt
+++ b/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
@@ -18,18 +18,18 @@
 #   02110-1301, USA.
 
 if(TARGET python-fd)
-  create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset")
+  create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset-basic")
 else()
-  create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset" DISABLED)
+  create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset-basic" DISABLED)
 endif()
 
 if(TARGET python3-fd)
-  create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset")
+  create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset-basic")
   # Fails with UnicodeEncodeError: 'utf-8' codec can't encode characters in
   # position 133-142: surrogates not allowed
   set_tests_properties(
-    "${SYSTEMTEST_PREFIX}py3plug-fd-local-fileset" PROPERTIES LABELS "broken"
+    "${SYSTEMTEST_PREFIX}py3plug-fd-local-fileset-basic" PROPERTIES LABELS "broken"
   )
 else()
-  create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset" DISABLED)
+  create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset-basic" DISABLED)
 endif()
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/messages/Daemon.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/messages/Standard.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/messages/Standard.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Differential.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Differential.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Full.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Full.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Incremental.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Incremental.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/pool/Scratch.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/pool/Scratch.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/profile/operator.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/profile/operator.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-dir.d/storage/File.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-dir.d/storage/File.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/client/myself.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/client/myself.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/client/myself.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/messages/Standard.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-fd.d/messages/Standard.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-fd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/device/FileStorage.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/device/FileStorage.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/device/FileStorage.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/messages/Standard.conf b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/messages/Standard.conf
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/messages/Standard.conf
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bconsole.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/etc/bareos/bconsole.conf.in
rename to systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bconsole.conf.in
diff --git a/systemtests/tests/py2plug-fd-local-fileset/python-modules/BareosFdPluginLocalFileset.py b/systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFileset.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/python-modules/BareosFdPluginLocalFileset.py
rename to systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/BareosFdPluginLocalFileset.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset/python-modules/bareos-fd-local-fileset.py b/systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset.py
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/python-modules/bareos-fd-local-fileset.py
rename to systemtests/tests/py2plug-fd-local-fileset-basic/python-modules/bareos-fd-local-fileset.py
diff --git a/systemtests/tests/py2plug-fd-local-fileset/testrunner b/systemtests/tests/py2plug-fd-local-fileset-basic/testrunner
similarity index 100%
rename from systemtests/tests/py2plug-fd-local-fileset/testrunner
rename to systemtests/tests/py2plug-fd-local-fileset-basic/testrunner
diff --git a/systemtests/tests/py3plug-fd-local-fileset b/systemtests/tests/py3plug-fd-local-fileset
deleted file mode 120000
index 616bb8019ed..00000000000
--- a/systemtests/tests/py3plug-fd-local-fileset
+++ /dev/null
@@ -1 +0,0 @@
-py2plug-fd-local-fileset
\ No newline at end of file
diff --git a/systemtests/tests/py3plug-fd-local-fileset-basic b/systemtests/tests/py3plug-fd-local-fileset-basic
new file mode 120000
index 00000000000..5bdd8cc870b
--- /dev/null
+++ b/systemtests/tests/py3plug-fd-local-fileset-basic
@@ -0,0 +1 @@
+py2plug-fd-local-fileset-basic
\ No newline at end of file

From a0d38988b8e0dba22987f4022298ae2c7a955c34 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Mon, 19 Sep 2022 12:45:53 +0200
Subject: [PATCH 21/21] format: apply bareos-check-sources changes

---
 .../tests/encrypt-signature-no-tls/CMakeLists.txt   |  2 +-
 .../py2plug-fd-local-fileset-basic/CMakeLists.txt   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt b/systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt
index cfd54bc5868..2a79b7f8aea 100644
--- a/systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt
+++ b/systemtests/tests/encrypt-signature-no-tls/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt b/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
index 2b404000a04..90e7ac35f7d 100644
--- a/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
+++ b/systemtests/tests/py2plug-fd-local-fileset-basic/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2021-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2021-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -20,7 +20,9 @@
 if(TARGET python-fd)
   create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset-basic")
 else()
-  create_systemtest(${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset-basic" DISABLED)
+  create_systemtest(
+    ${SYSTEMTEST_PREFIX} "py2plug-fd-local-fileset-basic" DISABLED
+  )
 endif()
 
 if(TARGET python3-fd)
@@ -28,8 +30,11 @@ if(TARGET python3-fd)
   # Fails with UnicodeEncodeError: 'utf-8' codec can't encode characters in
   # position 133-142: surrogates not allowed
   set_tests_properties(
-    "${SYSTEMTEST_PREFIX}py3plug-fd-local-fileset-basic" PROPERTIES LABELS "broken"
+    "${SYSTEMTEST_PREFIX}py3plug-fd-local-fileset-basic" PROPERTIES LABELS
+                                                                    "broken"
   )
 else()
-  create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset-basic" DISABLED)
+  create_systemtest(
+    ${SYSTEMTEST_PREFIX} "py3plug-fd-local-fileset-basic" DISABLED
+  )
 endif()