From 183f700668adce506818201f58dfcebbea014fd8 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 24 Dec 2003 20:26:58 +0000
Subject: [PATCH] Update for new restore

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@949 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/tests/backup-bacula-tape        | 4 ++--
 regress/tests/bextract-test             | 2 +-
 regress/tests/bscan-test                | 2 +-
 regress/tests/bsr-opt-test              | 2 +-
 regress/tests/compressed-test           | 2 +-
 regress/tests/concurrent-jobs-test      | 2 +-
 regress/tests/four-concurrent-jobs-tape | 2 +-
 regress/tests/four-concurrent-jobs-test | 2 +-
 regress/tests/four-jobs-test            | 6 +++---
 regress/tests/incremental-tape          | 2 +-
 regress/tests/incremental-test          | 5 +----
 regress/tests/recycle-test              | 2 +-
 regress/tests/restore-by-file-tape      | 5 +----
 regress/tests/restore-by-file-test      | 2 +-
 regress/tests/restore2-by-file-test     | 5 +----
 regress/tests/six-vol-test              | 2 +-
 regress/tests/small-file-size-tape      | 2 +-
 regress/tests/span-vol-test             | 2 +-
 regress/tests/sparse-compressed-test    | 2 +-
 regress/tests/sparse-test               | 2 +-
 regress/tests/two-jobs-test             | 6 +++---
 regress/tests/two-vol-test              | 2 +-
 regress/tests/two-volume-tape           | 2 +-
 regress/tests/usr-tape-root             | 8 ++++----
 regress/tests/weird-files-test          | 2 +-
 regress/tests/weird-files2-test         | 2 +-
 26 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index e4cd2ba5e4..ec34dddb81 100755
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -34,7 +34,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages
@@ -52,7 +52,7 @@ messages
 @# now do a second restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages
diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 908a966042..0587542625 100755
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -36,7 +36,7 @@ messages
 @# now build the bsr file
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 no
 wait
 messages
diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index ee90676fee..c41972290a 100755
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -60,7 +60,7 @@ messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages
diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 7cfb20c703..adee285f2b 100755
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -38,7 +38,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select
+restore where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
 mark *
diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 6ed16f3d13..7857b00bf5 100755
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -35,7 +35,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 28a1fa1ba4..99bb1cd186 100755
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -51,7 +51,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 400d3fda88..98d91a26e1 100755
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -40,7 +40,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages
diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index e33e8c1cdd..a0f2b03308 100755
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -50,7 +50,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages
diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index d283a33174..30f42fbca6 100755
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -91,14 +91,14 @@ echo "Backup 4 done"
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index c8b0bd731f..278766a36c 100755
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -53,7 +53,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
+restore where=${cwd}/tmp/bacula-restores storage=DDS-4
 7
 <${cwd}/tmp/restore-list
 
diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 0c442894e1..375d7dad77 100755
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -53,10 +53,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
-7
-<${cwd}/tmp/restore-list
-
+restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
 yes
 wait
 messages
diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 8f853e4d1f..f21171b8a4 100755
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -66,7 +66,7 @@ list volumes
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages
diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 9b2d82bd79..f8dd658c3a 100755
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -39,10 +39,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-7
-<${cwd}/tmp/restore2-list
-
+restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list
 yes
 wait
 messages
diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 101a9421dd..b120c6715d 100755
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -41,7 +41,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores 
+restore where=${cwd}/tmp/bacula-restores storage=File
 7
 <${cwd}/tmp/restore-list
 
diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 142ebb7143..acf8a457be 100755
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -34,10 +34,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores
-7
-<${cwd}/tmp/restore2-list
-
+restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list
 yes
 wait
 messages
diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 121609e89a..4b076d198b 100755
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -41,7 +41,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 4b3d327ef9..497b1b539f 100755
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -35,7 +35,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages
diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 35ae3fa11b..36d52e0148 100755
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -42,7 +42,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages
diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 8542ba0f9b..1c28061a71 100755
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -33,7 +33,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out   
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 0943b03fe2..ca44e623f1 100755
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -33,7 +33,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File 
 yes
 wait
 messages
diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index bb09dd69ce..13c6a6297e 100755
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -51,14 +51,14 @@ messages
 @# now do several restores to ensure we cleanup between jobs
 @#
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index bb5f73f367..3149a628ce 100755
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -35,7 +35,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File1
 yes
 wait
 messages
diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 34012aa4e1..a212dc3748 100755
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -39,7 +39,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4
 yes
 wait
 messages
diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 12caac0d52..f5f87eab27 100755
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -21,9 +21,9 @@ echo " "
 echo " "
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -31,12 +31,12 @@ messages
 @# 
 @# now do a restore
 @#
-@tee tmp/log2.out
+@output tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select all
 yes
 wait
 messages
-@tee
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null
diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 73a9bea331..387fa3763e 100755
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -40,7 +40,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all storage=File
 yes
 wait
 messages
diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 35d03a4cb4..755525c346 100755
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -56,7 +56,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=
+restore where= storage=File
 5
 done
 yes
-- 
2.39.5