Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6202 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 5f518fcfa75dd77925f9b22eab22811c8a3cdf63..3f8da3cfa036a0d02b0fc55383c060d130fe853f 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -24,7 +24,7 @@ nice tests/truncate-bug-tape
 nice tests/two-pool-tape
 nice tests/2drive-incremental-2tape
 nice tests/bscan-tape
-nice tests/verify-vol-tape
-nice tests/vol-duration-tape
+nice tests/verify-vol-1t1d-tape
+nice tests/vol-duration-2t1da-tape
 echo "End all non-root tape tests"
 echo "End all non-root tape tests" >>test.out

diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index bdf03186a57807c1ec8a288554bb75c6e5505250..613d4a2ba38f2d935a6ad7758652723405c83a39 100755 (executable)
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -5,7 +5,7 @@
 #
 # This script uses the autochanger and two tapes
 #
-TestName="2drive-incremental-2tape"
+TestName="2drive-incremental-2t2da-tape"
 JobName="2drive2tape"
 . scripts/functions
 

diff --git a/regress/tests/verify-vol-1t1d-tape b/regress/tests/verify-vol-1t1d-tape
new file mode 100755 (executable)
index 0000000..914422f
--- /dev/null
+++ b/regress/tests/verify-vol-1t1d-tape
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory
+#   then verify the catalog.           
+#
+TestName="verify-vol-1t1d-tape"
+JobName=VerifyVol
+. scripts/functions
+
+copy_tape_confs
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+change_jobname NightlySave $JobName
+start_test
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log1.out
+setdebug level=1 storage=DDS-4 sd
+label storage=DDS-4 volume=TestVolume001 pool=Default
+run job=$JobName yes
+wait
+messages
+@# 
+@# now do a verify volume
+@#
+@$out ${cwd}/tmp/original
+run job=VerifyTape pool=Default
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+
+sleep 2
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^  Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
+rstat=$?
+dstat=0
+end_test

diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape
deleted file mode 100755 (executable)
index 9927ade..0000000
--- a/regress/tests/verify-vol-tape
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Run a simple backup of the Bacula build directory
-#   then verify the catalog.           
-#
-TestName="verify-vol-tape"
-JobName=VerifyVol
-. scripts/functions
-
-copy_tape_confs
-
-echo "${cwd}/build" >${cwd}/tmp/file-list
-
-change_jobname NightlySave $JobName
-start_test
-
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
-messages
-@$out tmp/log1.out
-setdebug level=1 storage=DDS-4 sd
-label storage=DDS-4 volume=TestVolume001 pool=Default
-run job=$JobName yes
-wait
-messages
-@# 
-@# now do a verify volume
-@#
-@$out ${cwd}/tmp/original
-run job=VerifyTape pool=Default
-yes
-wait
-messages
-@$out
-quit
-END_OF_DATA
-
-run_bacula
-
-sleep 2
-check_for_zombie_jobs storage=DDS-4
-stop_bacula
-
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-grep "^  Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null
-rstat=$?
-dstat=0
-end_test

diff --git a/regress/tests/vol-duration-2t1da-tape b/regress/tests/vol-duration-2t1da-tape
new file mode 100755 (executable)
index 0000000..1274f2f
--- /dev/null
+++ b/regress/tests/vol-duration-2t1da-tape
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory but 
+#   create two volumes and set a short Volume duration on
+#   the first so that it will be used, recycled.  Then
+#   Bug #1032 indicates it will get a changer error when
+#   loading the second volume. However, we cannot reproduce
+#   this problem.
+#
+# This test uses an autochanger
+#
+TestName="vol-duration-2t:1d:a-tape"
+JobName=VolDuration
+. scripts/functions
+
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "$TestName test skipped. No autochanger."
+   exit
+fi
+
+scripts/cleanup
+scripts/copy-2tape-confs
+scripts/prepare-two-tapes
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+change_jobname NightlySave $JobName
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+setdebug level=100 storage=DDS-4
+label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0
+label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0
+update Volume=TestVolume001 VolUse=30
+update Volume=TestVolume002 VolUse=30
+run job=$JobName level=Full Storage=DDS-4 yes
+@sleep 31
+run job=$JobName level=Full Storage=DDS-4 yes
+wait
+messages
+list volumes
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+unmark *
+mark *
+done
+yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test

diff --git a/regress/tests/vol-duration-tape b/regress/tests/vol-duration-tape
deleted file mode 100755 (executable)
index 1274f2f..0000000
--- a/regress/tests/vol-duration-tape
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# Run a simple backup of the Bacula build directory but 
-#   create two volumes and set a short Volume duration on
-#   the first so that it will be used, recycled.  Then
-#   Bug #1032 indicates it will get a changer error when
-#   loading the second volume. However, we cannot reproduce
-#   this problem.
-#
-# This test uses an autochanger
-#
-TestName="vol-duration-2t:1d:a-tape"
-JobName=VolDuration
-. scripts/functions
-
-if test x${AUTOCHANGER} = x/dev/null ; then
-   echo "$TestName test skipped. No autochanger."
-   exit
-fi
-
-scripts/cleanup
-scripts/copy-2tape-confs
-scripts/prepare-two-tapes
-
-echo "${cwd}/build" >${cwd}/tmp/file-list
-
-change_jobname NightlySave $JobName
-start_test
-
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
-messages
-@$out ${cwd}/tmp/log1.out
-setdebug level=100 storage=DDS-4
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0
-update Volume=TestVolume001 VolUse=30
-update Volume=TestVolume002 VolUse=30
-run job=$JobName level=Full Storage=DDS-4 yes
-@sleep 31
-run job=$JobName level=Full Storage=DDS-4 yes
-wait
-messages
-list volumes
-@# 
-@# now do a restore
-@#
-@$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
-unmark *
-mark *
-done
-yes
-wait
-messages
-@output
-quit
-END_OF_DATA
-
-run_bacula
-check_for_zombie_jobs storage=DDS-4
-stop_bacula
-
-check_two_logs
-check_restore_diff
-end_test