Update 2drive test

[bacula/bacula] / regress / tests / four-jobs-test

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 05da4ccb4d3a14777efc622c04ac68b3d3bded30..db27f2c9b644ea8fd480de71a6605a4a0134e85d 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -7,24 +7,23 @@
 TestName="four-jobs-test"
 JobName=SpanVol
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
+scripts/copy-test-confs
 echo "${cwd}/build" >/tmp/file-list
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
+estimate job=$JobName listing
+estimate job=$JobName listing
+estimate job=$JobName listing
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -44,7 +43,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out  tmp/log1.out
-run job=CompressedTest
+run job=$JobName
 yes
 wait
 messages
@@ -65,7 +64,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @output tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -85,7 +84,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @output tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -120,7 +119,7 @@ END_OF_DATA
 
 run_bconsole
 check_for_zombie_jobs storage=File
-bacula_stop
+stop_bacula
 
 check_two_logs
 check_restore_diff