Tweak remove unused regression tests + add some new ones

[bacula/bacula] / regress / tests / incremental-2media

diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index d8ef6b15e7085ac189949f63e1d3b7ea267c7667..a2d162d0e403f432a8a85a5cddf80a39f7e24fe1 100755 (executable)
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do an Incremental onto a different medium 
@@ -13,7 +18,7 @@ JobName=Inc2media
 
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
@@ -24,7 +29,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=File volume=TestVolume002 Pool=Default
 run job=$JobName yes
 wait
@@ -34,7 +39,6 @@ END_OF_DATA
 
 run_bacula
 
-echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -53,16 +57,15 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-setdebug level=151 storage=DDS-4
+setdebug level=151 storage=tape
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes
 wait
 restore where=${cwd}/tmp/bacula-restores select all done 
 yes
 wait
-status storage=DDS-4
+status storage=tape
 messages
-@$out
 quit
 END_OF_DATA