Fix regression minor scripting problems

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

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index d1b047030df3a5d4c69e0092468a20beff1dc6d0..8e47b1720c84e7077c3062124e14541097caf01a 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run four jobs at the same time, with two Volumes.
 #   Set max Vol bytes of first volume
@@ -29,27 +34,28 @@ update Volume=TestVolume001 MaxVolBytes=100000000
 @#12
 setdebug level=51 Storage=File1
 status storage=File1
+status client
 llist volume=TestVolume001
 llist volume=TestVolume002
 list nextvol
 1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 list nextvol
 1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 list nextvol
 1
 run job=$JobName level=Full Storage=File1
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 list nextvol
@@ -58,41 +64,51 @@ status storage=File1
 run job=$JobName level=Full Storage=File1
 yes
 status storage=File1
-reload
-reload
+status client
+@#reload
+@#reload
 list nextvol
 1
 @sleep 2
 status dir
+status client
 status storage=File1
 llist volume=TestVolume001
 llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
 messages
-reload
-reload
+@#reload
 wait
+status client
 status storage=File1
-reload
+@#reload
 list nextvol
 1
 messages
 @# 
 @# now do a restore
 @#
+@$out ${cwd}/tmp/jobmedia.out
+list volumes
+sql
+select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia;
+
+
 @$out   ${cwd}/tmp/log2.out
+status client
+status storage=File1
+setdebug level=100 Storage=File1
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 mark *
 done
 yes
+wait
 run job=$JobName level=Full Storage=File1 yes
 wait
-reload
-reload
+@#reload
 messages
-@output
 quit
 END_OF_DATA