Backport from Bacula Enterprise

[bacula/bacula] / regress / tests / restart-job-test

diff --git a/regress/tests/restart-job-test b/regress/tests/restart-job-test
index 4c36734d006eeeb626230ce6f74d24d4fbcb5fbb..c1ead85e2e9cf70ba6ddc3733da4f377117117dc 100755 (executable)
--- a/regress/tests/restart-job-test
+++ b/regress/tests/restart-job-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a backup of the build directory but force it to have
 #   a comm error, and check that it restarts correctly.
@@ -9,18 +14,20 @@ JobName=RestartJob
 
 scripts/cleanup
 scripts/copy-test-confs
+
+
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=0 trace=0 hangup=100 client
+setdebug level=0 trace=0 hangup=596 client
 @#setdebug level=20 dir
-label storage=File volume=TestVolume001
+label storage=File volume=TestVolume001 slot=1 drive=0
 run job=$JobName yes
 wait
 messages
@@ -35,7 +42,7 @@ run_bacula
 scripts/check_for_zombie_jobs storage=File
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @# 
 @# now do a restore