add python-modules subdirectory

bareos · Jan 10, 2020 · f2e2f51 · f2e2f51
1 parent b98a851
commit f2e2f51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...s/tests/python-fd-percona-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaTest.conf.in b/...s/tests/python-fd-percona-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaTest.conf.in
@@ -1,5 +1,5 @@
 FileSet {
-  Name = "perconaTest"
+  Name = "PerconaTest"
   Description = "Test the Plugin functionality of the oVirt Plugin."
   Include {
     Options {

diff --git a/.../tests/python-fd-percona-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in b/.../tests/python-fd-percona-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
@@ -2,5 +2,5 @@ Job {
   Name = "backup-bareos-fd"
   JobDefs = "DefaultJob"
   Client = "bareos-fd"
-  FileSet = "perconaTest"
+  FileSet = "PerconaTest"
 }
diff --git a/systemtests/tests/python-fd-percona-plugin-test/python-modules/README b/systemtests/tests/python-fd-percona-plugin-test/python-modules/README
@@ -0,0 +1 @@
+If this directory exists, the python modules will be linked here
diff --git a/systemtests/tests/python-fd-percona-plugin-test/testrunner b/systemtests/tests/python-fd-percona-plugin-test/testrunner
@@ -2,7 +2,7 @@
 #
 # This systemtest tests the oVirt plugin functionality
 # of the Bareos FD by using the supplied module
-#   BareosFdPluginOvirt.py
+#   BareosFdPluginPercona.py
 #
 TestName="$(basename "$(pwd)")"
 export TestName
@@ -14,8 +14,6 @@ JobName=backup-bareos-fd
 ${scripts}/cleanup
 ${scripts}/setup
 
-curl -k -o ${BAREOS_CONFIG_DIR}/ovirt-ca.cert "https://$OVIRT_SERVER/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA"
-
 # Directory to backup.
 # This directory will be created by setup_data().
 # BackupDirectory="${tmp}/data"
@@ -43,7 +41,7 @@ messages
 @#
 @$out $tmp/log2.out
 wait
-restore client=bareos-fd fileset=OvirtTest where=$tmp/bareos-restores pluginoptions=python:local=yes select all done
+restore client=bareos-fd fileset=PerconaTest where=$tmp/bareos-restores pluginoptions=python:local=yes select all done
 yes
 wait
 messages