Fix bad slot

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

diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index 8b15caf13d7ef1ae0a98f31351a62144d8c16014..275f9f0d23a162ec9661da5177502930b2bccdc8 100755 (executable)
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -36,8 +36,9 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0
+setdebug level=150 storage=DDS-4
+label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Full drive=$DRIVE1
+label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
 list volumes
 @# Start job with Client run before and sleep
 run job=NightlySave1 level=Full pool=Default yes
@@ -45,16 +46,19 @@ run job=NightlySave1 level=Full pool=Default yes
 run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 60
-@#setdebug level=100 storage=DDS-4
+list volumes
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
+list volumes
 messages
 @sleep 10
+list volumes
 messages
 @sleep 10
 status storage=DDS-4
+list volumes
 messages
 wait
 list volumes

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index e6c5312e245b6df139b62fb57dd94127b50b9667..b7c4e0abe4c073536472304eacd502c98c4ac200 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -33,9 +33,9 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-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 MaxVolBytes=3000000 pool=Default drive=0
+label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
+update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=$DRIVE1
 sql
 select * from Storage;
 select VolumeName,InChanger,Slot,StorageId from Media;