X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftwo-pool-test;h=e54a3a0882f53940a65c76cafdcfc02a37b49700;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=2b568f6c1eea9e564fa0e42f8b732ab1d1fabb07;hpb=cd3490b65217191c4e90f5c406bdd96de293d18c;p=bacula%2Fbacula

diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index 2b568f6c1e..e54a3a0882 100755
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -4,7 +4,7 @@
 #  an autochanger. Note, the Director has three Pools in its 
 #  conf:  Default, Full, and Inc.  Default is used in the
 #  NightlySave job by default.  What is backed up is what
-#  is in /tmp/file-list, which is by default the Bacula
+#  is in ${cwd}/tmp/file-list, which is by default the Bacula
 #  source code (i.e. the build directory).
 #
 #  Note, we use the virtual disk autochanger.
@@ -12,40 +12,35 @@
 TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
-set_debug 0
 
-. config.out
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
 # Make a relatively large backup set 5 x source code directory
 #  Reduced to 1 for portable
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 start_test
 
 # Write out bconsole commands to a file
 cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
-@#setdebug level=150 storage=DDS-4
-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=tape
+label storage=tape volume=TestVolume001 slot=1 pool=Full drive=0
+label storage=tape volume=TestVolume002 slot=2 pool=Default drive=0
 list volumes
 @# Start job with Client run before and sleep
 run job=NightlySave1 level=Full pool=Default yes
 run job=NightlySave1 level=Full pool=Default yes
-run job=NightlySave1 level=Full pool=Default yes
 @# wait between starting jobs
 @sleep 30
-@#setdebug level=100 storage=DDS-4
-run job=NightlySave2 level=Full pool=Full yes
+@#setdebug level=100 storage=tape
 run job=NightlySave2 level=Full pool=Full yes
 run job=NightlySave2 level=Full pool=Full yes
 @sleep 10
@@ -53,7 +48,7 @@ messages
 @sleep 10
 messages
 @sleep 10
-status storage=DDS-4
+status storage=tape
 messages
 wait
 list volumes
@@ -62,16 +57,17 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+release storage=tape drive=0
+release storage=tape drive=1
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs