From dd6ee08b6617c96b862224a1a221f61f9f27f269 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 3 Aug 2005 12:54:49 +0000 Subject: [PATCH] Update tape tests for pool git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2284 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/tests/backup-bacula-tape | 45 +++++++++++++++++++------ regress/tests/backup-win32-tape | 2 +- regress/tests/bscan-tape | 2 +- regress/tests/fixed-block-size-tape | 2 +- regress/tests/four-concurrent-jobs-tape | 2 +- regress/tests/four-jobs-tape | 2 +- regress/tests/incremental-tape | 2 +- regress/tests/relabel-tape | 2 +- regress/tests/restore-by-file-tape | 2 +- regress/tests/small-file-size-tape | 2 +- regress/tests/truncate-bug-tape | 2 +- regress/tests/two-volume-tape | 4 +-- 12 files changed, 46 insertions(+), 23 deletions(-) diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index 7b6a0bebfa..c0535e3d39 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -5,6 +5,12 @@ # we can correctly append to a tape. # cwd=`pwd` +debug=1 +if test "$debug" -eq 1 ; then + out="tee" +else + out="output" +fi scripts/copy-tape-confs scripts/cleanup-tape @@ -16,12 +22,12 @@ echo " === Starting Backup Bacula tape test at `date +%R:%S` ===" echo " === Starting Backup Bacula tape test at `date +%R:%S` ===" >>working/log echo " " -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null +# Write out bconsole commands +cat <tmp/bconcmds @output /dev/null messages -@output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +@$out tmp/log1.out +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default purge volume=TestVolume001 relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0 purge volume=TestVolume002 @@ -62,37 +68,54 @@ messages @# @# now do a restore @# -@output tmp/log2.out +@$out tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages END_OF_DATA + +if test "$debug" -eq 1 ; then + bin/bacula start + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf +else + bin/bacula start 2>&1 >/dev/null + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null +fi + bin/bacula stop 2>&1 >/dev/null # # Now do a second backup after making a few changes # touch ${cwd}/build/src/dird/*.c echo "test test" > ${cwd}/build/src/dird/xxx -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -@output /dev/null + +cat <tmp/bconcmds +@$out /dev/null messages -@output tmp/log1.out +@$out tmp/log1.out run job=NightlySave yes wait messages @# @# now do a second restore @# -@output tmp/log2.out +@$out tmp/log2.out restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@output +@$out quit END_OF_DATA + +if test "$debug" -eq 1 ; then + bin/bacula start + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf +else + bin/bacula start 2>&1 >/dev/null + cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null +fi scripts/check_for_zombie_jobs storage=DDS-4 bin/bacula stop 2>&1 >/dev/null diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape index 68472ae556..3723b536dd 100755 --- a/regress/tests/backup-win32-tape +++ b/regress/tests/backup-win32-tape @@ -21,7 +21,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave yes wait messages diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index a2d46fd728..91a3dc9ae5 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -21,7 +21,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave level=Full Storage=DDS-4 yes run job=NightlySave level=Full Storage=DDS-4 yes run job=NightlySave level=Full Storage=DDS-4 yes diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index f78cd840a9..483af3d5bf 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -24,7 +24,7 @@ estimate job=NightlySave listing estimate job=NightlySave listing messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave yes wait messages diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 44618f9724..4b827d7eb7 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -28,7 +28,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave yes wait messages diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape index 6b3a5b6e13..795f3534eb 100755 --- a/regress/tests/relabel-tape +++ b/regress/tests/relabel-tape @@ -23,7 +23,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave level=Full yes wait messages diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index c95f5ae763..647c204e89 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -26,7 +26,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default run job=NightlySave level=Full yes wait messages diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index 1b3410d6a3..4f8b0115d5 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -22,7 +22,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default setdebug level=2 storage=DDS-4 run job=NightlySave yes wait diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index 6ade802a9f..040540d2ad 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -19,7 +19,7 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 +label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default @# do a bunch of saves so we have 12 files on the tape run job=NightlySave yes run level=Full job=NightlySave yes diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape index b7acfb3bb0..f87c0f448a 100755 --- a/regress/tests/two-volume-tape +++ b/regress/tests/two-volume-tape @@ -28,8 +28,8 @@ bin/bconsole -c bin/bconsole.conf <&1 >/dev/null @output /dev/null messages @output tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 -label storage=DDS-4 volume=TestVolume002 slot=2 +label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default +label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default update Volume=TestVolume001 MaxVolBytes=3000000 run job=NightlySave yes wait -- 2.39.5