Update two-vol-manual-tape

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

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index c955a9fb029582d1e9e3e9421a2838d71fc9862c..edeba6a2ab133300dadb8b0a28a2b48eb49aa828 100644 (file)
--- a/regress/DartTestfile.txt.in
+++ b/regress/DartTestfile.txt.in
@@ -78,7 +78,7 @@ ADD_TEST(tape:verify-vol-tape "@regressdir@/tests/verify-vol-tape")
 ADD_TEST(changer:incremental-changer "@regressdir@/tests/incremental-changer")
 ADD_TEST(changer:two-pool-changer "@regressdir@/tests/two-pool-changer")
 ADD_TEST(changer:two-volume-changer "@regressdir@/tests/two-volume-changer")
-ADD_TEST(changer:two-vol-manual-tape "@regressdir@/tests/two-vol-manual-tape")
+# ADD_TEST(changer:two-vol-manual-tape "@regressdir@/tests/two-vol-manual-tape")
 ADD_TEST(changer:vol-duration-changer "@regressdir@/tests/vol-duration-changer")
 
 ADD_TEST(2drive-changer:2drive-incremental-changer "@regressdir@/tests/2drive-incremental-changer")

diff --git a/regress/all-tape-tests b/regress/all-tape-tests
index 366f8eec041436f94ef9b5ca90a45bce5233ec04..8db518b9ea91bb08ac348623254725985893f375 100755 (executable)
--- a/regress/all-tape-tests
+++ b/regress/all-tape-tests
@@ -28,6 +28,6 @@ nice tests/restore-by-file-tape
 nice tests/small-file-size-tape
 nice tests/truncate-bug-tape
 nice tests/verify-vol-tape
-nice tests/two-vol-manual-tape
+# nice tests/two-vol-manual-tape
 echo "End all non-root tape tests"
 echo "End all non-root tape tests" >>test.out

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 6fa0378e511c6d8e6e14a5329be27597230350d3..b3285d97520445f9b1fd1b56e6f52a425d100ef3 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -300,6 +300,26 @@ rewind_drive()
   fi
 }
 
+load_slot1() 
+{
+# Get a tape from slot1
+slot=`bin/$MTX ${AUTOCHANGER} loaded 0 ${TAPE_DRIVE} $DRIVE1`
+case $slot in
+ 0)
+    bin/$MTX ${AUTOCHANGER} load $SLOT1 ${TAPE_DRIVE} $DRIVE1
+    slot=$SLOT1
+    ;;
+ $SLOT1)
+    slot=$SLOT1
+    ;;
+ *)
+    rewind_drive ${TAPE_DRIVE}
+    bin/$MTX ${AUTOCHANGER} unload $slot  ${TAPE_DRIVE} $DRIVE1
+    bin/$MTX ${AUTOCHANGER} load   $SLOT1 ${TAPE_DRIVE} $DRIVE1
+    slot=$SLOT1
+    ;;
+esac
+}
 
 #
 # $1 has currently loaded slot, load the other one i.e. if 1, load 2;

diff --git a/regress/tests/two-vol-manual-tape b/regress/tests/two-vol-manual-tape
index 6d38dd9928ad0f5af36e5f91dd9e6f63c5cf6cf6..ef9bf8f06ea19472a866178ab0d1029d25318530 100755 (executable)
--- a/regress/tests/two-vol-manual-tape
+++ b/regress/tests/two-vol-manual-tape
@@ -30,23 +30,7 @@ export slot
 init_slot $TAPE_DRIVE $SLOT1
 init_slot $TAPE_DRIVE $SLOT2
 
-# Get a tape from slot1
-slot=`bin/$MTX ${AUTOCHANGER} loaded 0 ${TAPE_DRIVE} $DRIVE1`
-case $slot in
- 0)
-    bin/$MTX ${AUTOCHANGER} load $SLOT1 ${TAPE_DRIVE} $DRIVE1
-    slot=$SLOT1
-    ;;
- $SLOT1)
-    slot=$SLOT1
-    ;;
- *)
-    rewind_drive ${TAPE_DRIVE}
-    bin/$MTX ${AUTOCHANGER} unload $slot  ${TAPE_DRIVE} $DRIVE1
-    bin/$MTX ${AUTOCHANGER} load   $SLOT1 ${TAPE_DRIVE} $DRIVE1
-    slot=$SLOT1
-    ;;
-esac
+load_slot1
 
 init_drive ${TAPE_DRIVE}
 
@@ -60,10 +44,12 @@ messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume002 slot=0 pool=Default drive=0
 unmount storage=DDS-4
+quit
 END_OF_DATA
 
 run_bacula
 
+# Load slot2
 load_other_slot $slot
 init_drive ${TAPE_DRIVE}
 
@@ -88,6 +74,7 @@ END_OF_DATA
 
 run_bconsole
 
+
 load_other_slot $slot
 init_drive ${TAPE_DRIVE}