Changes needed to use the new standard config

Mostly changing the used pool in the checks from File to Full, as there is no File pool anymore. Also change the filesets from File = / to File = /usr/sbin for the tests to limit the amount of backed up data. Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
bareos · Sep 6, 2013 · bc0708c · bc0708c
1 parent 6628042
commit bc0708c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -34,6 +34,9 @@ bareos: all
 sed:
 	echo "Doing: scripts/do_sed"
 	scripts/do_sed
+	echo "adapting default fileset for regression tests"
+	cp bin/bareos-dir.conf bin/bareos-dir.conf.orig
+	sed 's#File.*/$$#File = /usr/sbin#g'  < bin/bareos-dir.conf.orig > bin/bareos-dir.conf
 
 # Run all disk tests
 test:

diff --git a/tests/acl-xattr-test b/tests/acl-xattr-test
@@ -208,7 +208,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File1 pool=File slot=1 drive=0
+label volume=TestVolume001 storage=File1 pool=Full slot=1 drive=0
 @#setdebug level=400 trace=1 client
 @#setdebug level=300 trace=1 director
 @#setdebug level=300 trace=1 storage=File1

diff --git a/tests/backup-bareos-test b/tests/backup-bareos-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 messages
 @$out $tmp/log1.out
 setdebug level=100 storage=File
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 status storage=File
 status storage=File

diff --git a/tests/estimate-test b/tests/estimate-test
@@ -29,7 +29,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 @$out /dev/null
 messages
 @$out $tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages

diff --git a/tests/fileregexp-test b/tests/fileregexp-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >${tmp}/bconcmds
 @$out /dev/null
 messages
 @$out ${tmp}/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages

diff --git a/tests/messages-test b/tests/messages-test
@@ -40,7 +40,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 messages
 @$out $tmp/log1.out
 @#setdebug level=100 storage=File
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 @sleep 1
 status storage=File

diff --git a/tests/no-chksum-test b/tests/no-chksum-test
@@ -27,7 +27,7 @@ cat <<END_OF_DATA >$tmp/bconcmds
 @$out /dev/null
 messages
 @$out $tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 END_OF_DATA
 
 run_bareos

diff --git a/tests/source-addr-test b/tests/source-addr-test
@@ -60,7 +60,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@#label volume=TestVolume001 storage=File pool=File
+@#label volume=TestVolume001 storage=File pool=Full
 @#setdebug level=100 storage=File
 run job=$JobName yes
 @sleep 3
@@ -97,7 +97,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 @#setdebug level=100 storage=File
 wait
 messages

diff --git a/tests/stats-test b/tests/stats-test
@@ -26,7 +26,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File pool=Full
 run job=$JobName yes
 wait
 messages