Update

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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 92cd44b28c1fe50d689214864edf2a432cc45bde..7c0798cfb4406afa1823870bd307a517df84958e 100755 (executable)
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -47,7 +47,7 @@ nice tests/migration-time-test
 nice tests/hardlink-test
 # 
 # The following are Virtual Disk Autochanger tests
-nice tests/two-pool-test
+# nice tests/two-pool-test
 nice tests/two-volume-test
 nice tests/incremental-2disk
 nice tests/2drive-incremental-2disk

diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test
new file mode 100755 (executable)
index 0000000..5eca017
--- /dev/null
+++ b/regress/tests/fast-two-pool-test
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# This is Arno's test.  It uses two pools, two tapes, and
+#  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
+#  source code (i.e. the build directory).
+#
+#  Note, we use the virtual disk autochanger.
+#
+TestName="fast-two-pool-test"
+JobName=Fast-two-pool
+. scripts/functions
+set_debug 1
+
+. config.out
+cwd=`pwd`
+scripts/cleanup
+scripts/copy-2disk-confs
+scripts/prepare-two-disks
+ 
+# 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
+
+start_test
+
+# Write out bconsole commands to a file
+cat <<END_OF_DATA >tmp/bconcmds
+@output /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
+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
+@# wait between starting jobs
+@sleep 10
+@#setdebug level=100 storage=DDS-4
+run job=NightlySave1 level=Full pool=Full yes
+run job=NightlySave1 level=Full pool=Full yes
+status storage=DDS-4
+messages
+wait
+list volumes
+messages
+@# 
+@# now do a restore
+@#
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+# exit
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test