regress: tweak append-immutable tests to work with new directives

diff --git a/regress/tests/volume-append-many-vols-test b/regress/tests/volume-append-many-vols-test
index 0c9d49ca63aa1c2819887bb75885cb6e0899813f..5b56f10f7d9e5f2e2166f53951f6adf63cd2f35a 100755 (executable)
--- a/regress/tests/volume-append-many-vols-test
+++ b/regress/tests/volume-append-many-vols-test
@@ -30,6 +30,9 @@ cleanup()
 
 trap 'cleanup' EXIT INT TERM
 
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeAppendOnly", "yes", "Device", "FileChgr1-Dev1")'
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeAppendOnly", "yes", "Device", "FileChgr1-Dev2")'
+
 # Create temporary bacula-sd.service file so that we can run SD as systemd service
 scripts/create_sed
 sed -f ${tmp}/sed_tmp ${cwd}/build/platforms/systemd/bacula-sd.service.in > ${tmp}/test-bacula-sd.service

diff --git a/regress/tests/volume-append-test b/regress/tests/volume-append-test
index 9e627bdfda0ac0a066acf0086343512dd67e17b3..3918c33a165c8dee4f52b827711397ac93fe7aa8 100755 (executable)
--- a/regress/tests/volume-append-test
+++ b/regress/tests/volume-append-test
@@ -31,6 +31,8 @@ cleanup()
 
 trap 'cleanup' EXIT INT TERM
 
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeAppendOnly", "yes", "Device", "FileChgr1-Dev1")'
+
 # Create temporary bacula-sd.service file so that we can run SD as systemd service
 scripts/create_sed
 sed -f ${tmp}/sed_tmp ${cwd}/build/platforms/systemd/bacula-sd.service.in > ${tmp}/test-bacula-sd.service

diff --git a/regress/tests/volume-immutable-test b/regress/tests/volume-immutable-test
index bf1787413e82da4364be64543e2a9853b135d3ef..0036cf64ae0f35e2c2032c9389f2a1787d2eead2 100755 (executable)
--- a/regress/tests/volume-immutable-test
+++ b/regress/tests/volume-immutable-test
@@ -10,7 +10,7 @@
 # This test creates temporary bacula-sd.service file so that we can run SD
 # as systemd service.
 #
-TestName="volume-append-many-vols-test"
+TestName="volume-immutable-test"
 JobName=append
 
 . scripts/functions
@@ -53,8 +53,10 @@ $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MaximumVolumeSize", "50M", "De
 $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MaximumVolumeSize", "50M", "Device", "FileChgr1-Dev2")'
 
 # Set some protection directives
-$bperl -e 'add_attribute("$conf/bacula-sd.conf", "ProtectVolumes", "yes", "Device", "FileChgr1-Dev1")'
-$bperl -e 'add_attribute("$conf/bacula-sd.conf", "ProtectVolumes", "yes", "Device", "FileChgr1-Dev2")'
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeAppendOnly", "yes", "Device", "FileChgr1-Dev1")'
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeAppendOnly", "yes", "Device", "FileChgr1-Dev2")'
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeImmutable", "yes", "Device", "FileChgr1-Dev1")'
+$bperl -e 'add_attribute("$conf/bacula-sd.conf", "SetVolumeImmutable", "yes", "Device", "FileChgr1-Dev2")'
 $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MinimumVolumeProtectionTime", "10seconds", "Device", "FileChgr1-Dev1")'
 $bperl -e 'add_attribute("$conf/bacula-sd.conf", "MinimumVolumeProtectionTime", "10seconds", "Device", "FileChgr1-Dev2")'