From fdeb51e3475cd9a7552fa022d661c3e8fe5322c3 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 20 Nov 2008 11:01:45 +0000
Subject: [PATCH] Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8069 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/do_disk_no_setup             | 14 +++++
 regress/tests/broken-media-bug-test  |  3 ++
 regress/tests/bsr-read-test          | 80 ++++++++++++++++++++++++++++
 regress/tests/maxvol-test            |  4 ++
 regress/tests/migration-jobspan-test |  1 +
 5 files changed, 102 insertions(+)
 create mode 100755 regress/do_disk_no_setup
 create mode 100755 regress/tests/bsr-read-test

diff --git a/regress/do_disk_no_setup b/regress/do_disk_no_setup
new file mode 100755
index 0000000000..ec8a9bddb1
--- /dev/null
+++ b/regress/do_disk_no_setup
@@ -0,0 +1,14 @@
+#!/bin/sh
+echo " " >test.out
+cat build/config.out >>test.out
+echo " " >>test.out
+echo "Test results" >>test.out
+echo " " >>test.out
+./starttime
+nice ./all-disk-tests
+echo " "
+echo "End do_file tests"
+echo "End do_file tests" >>test.out
+scripts/cleanup
+cat test.out
+./endtime
diff --git a/regress/tests/broken-media-bug-test b/regress/tests/broken-media-bug-test
index 9e5cbe7638..5c42870c40 100644
--- a/regress/tests/broken-media-bug-test
+++ b/regress/tests/broken-media-bug-test
@@ -37,6 +37,8 @@ setdebug level=150  storage=File
 setdebug level=150  Director
 messages
 @$out tmp/log1.out
+label storage=File volume=TestVolume0001
+label storage=File volume=TestVolume0002
 run job=First yes
 messages
 quit
@@ -52,6 +54,7 @@ setdebug level=150  storage=File
 setdebug level=150  Director
 list volumes
 llist volume=TestVolume0001
+llist volume=TestVolume0002
 messages
 @$out tmp/log2.out
 run job=Second yes
diff --git a/regress/tests/bsr-read-test b/regress/tests/bsr-read-test
new file mode 100755
index 0000000000..8f6667e336
--- /dev/null
+++ b/regress/tests/bsr-read-test
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# Run a backup of a small file, then do several other backups
+#   to expand the size of a volume.  Then do a restore of the first
+#   file, and make sure it does read to the end of the disk.
+#
+TestName="bsr-read-test"
+JobName=bsr-read
+. scripts/functions
+
+scripts/cleanup
+scripts/copy-test-confs
+echo "${cwd}/build/configure" >${cwd}/tmp/file-list
+
+
+
+change_jobname CompressedTest $JobName
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+label storage=File volume=TestVolume001
+label storage=File volume=TestVolume002
+update Volume=TestVolume001 maxvolbytes=120000
+run job=$JobName yes
+wait
+messages
+list jobs
+@# print the JobMedia records
+sql
+select * from JobMedia;
+
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
+messages
+@$out ${cwd}/tmp/log1.out
+run job=$JobName level=Full yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out ${cwd}/tmp/log2.out
+setdebug level=30 fd     
+setdebug level=500 storage=File
+sql
+@# print the JobMedia records
+select * from JobMedia;
+
+restore
+3
+1
+mark *
+done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+# check_restore_tmp_build_diff
+dstat=0
+end_test
diff --git a/regress/tests/maxvol-test b/regress/tests/maxvol-test
index b934340670..a671c0b3d2 100755
--- a/regress/tests/maxvol-test
+++ b/regress/tests/maxvol-test
@@ -32,11 +32,15 @@ update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
 setdebug level=100 Storage=File1
+llist volume=TestVolume001
+llist volume=TestVolume002
 run job=$JobName level=Full Storage=File1 yes
 run job=$JobName level=Full Storage=File1 yes
 run job=$JobName level=Full Storage=File1 yes
 wait
 list volumes
+llist volume=TestVolume001
+llist volume=TestVolume002
 messages
 @# 
 @# now do a restore
diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index f62bd936e4..6fadb3a107 100755
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -61,6 +61,7 @@ wait
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
+setdebug level=500 storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger
 unmark *
 mark *
-- 
2.39.5