Remove reload

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6723 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index c888a0c40e172ed43db70e88e3235939724ae356..f3e5c0b75aeb79ee7194696762c519b6b028f43f 100755 (executable)
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -32,40 +32,40 @@ llist volume=TestVolume001
 llist volume=TestVolume002
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
+@#reload
 llist volume=TestVolume001
 llist volume=TestVolume002
 status storage=DDS-4
 run job=$JobName level=Full Storage=DDS-4
 yes
 status storage=DDS-4
-reload
-reload
-reload
-reload
+@#reload
+@#reload
+@#reload
+@#reload
 @sleep 2
 status dir
 status storage=DDS-4
 llist volume=TestVolume001
 llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
 messages
-reload
-reload
+@#reload
+@#reload
 wait
 status storage=DDS-4
-reload
+@#reload
 messages
 @# 
 @# now do a restore
@@ -77,8 +77,8 @@ mark *
 done
 yes
 wait
-reload
-reload
+@#reload
+@#reload
 messages
 @output
 quit

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 9413a8c081fcbd344020433bb8ac0e33c8e0098e..6874e5f7cc494f128ca82847c52e47a616c5adee 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -73,6 +73,7 @@ if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
       echo "  !!!!! Restored files differ          !!!!! " >>test.out
    fi
    echo " "
+   exit 1
 else
    echo "  ===== bsr-opt-test Bacula source OK `date +%R:%S` ===== "
    echo "  ===== bsr-opt-test OK `date +%R:%S` ===== " >>test.out

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 80a3fcc691895006f95bb081107346565435145d..6f10087dbc14b8ab2158bf3e873f352ce690273b 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -31,46 +31,61 @@ setdebug level=51 Storage=File1
 status storage=File1
 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
+1
 status storage=File1
 run job=$JobName level=Full Storage=File1
 yes
 status storage=File1
-reload
-reload
-reload
-reload
+@#reload
+@#reload
+list nextvol
+1
 @sleep 2
 status dir
 status storage=File1
 llist volume=TestVolume001
 llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
 messages
-reload
-reload
+@#reload
 wait
 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
 restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
@@ -79,8 +94,7 @@ done
 yes
 run job=$JobName level=Full Storage=File1 yes
 wait
-reload
-reload
+@#reload
 messages
 @output
 quit

diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test
index 1e29f85f3872049a0e619c0d8dc13197eb5f4627..b934340670a260a9f5c2e31311a9566bbcd835c1 100755 (executable)
--- a/regress/tests/maxvol-test
+++ b/regress/tests/maxvol-test
@@ -48,8 +48,8 @@ mark *
 done
 yes
 wait
-reload
-reload
+@#reload
+@#reload
 messages
 @output
 quit