Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
Fix regressions.
Browse files Browse the repository at this point in the history
- Remove state information after each run of the test in cleanup script.
- Call run_bconsole instead of run_bareos when doing multiple tests.
  run_bareos starts all daemons again which are still running.
- Lower debugging output of truncate-bug-tape
  • Loading branch information
Marco van Wieringen committed Feb 24, 2013
1 parent 2e57e00 commit 3ca60f4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions scripts/cleanup
Expand Up @@ -16,6 +16,7 @@ rm -rf ${working}/log ${tmp}/TEST-*
rm -rf ${working}/log ${tmp}/Backup-*
rm -rf ${working}/*.bsr ${working}/log*.sd
rm -rf ${working}/*.trace ${working}/*.traceback ${working}/*.bactrace
rm -rf ${working}/*.state
rm -rf ${tmp}disk-changer
rm -f ${cwd}/bin/plugins/test-plugin-fd.so
find . -name "gigaslam.gif" -exec rm -f {} \;
Expand Down
8 changes: 4 additions & 4 deletions tests/four-jobs-tape
Expand Up @@ -46,7 +46,7 @@ messages
quit
END_OF_DATA

run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 2 done"
Expand All @@ -65,7 +65,7 @@ messages
quit
END_OF_DATA

run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 3 done"
Expand All @@ -83,7 +83,7 @@ wait
messages
quit
END_OF_DATA
run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 4 done"
Expand Down Expand Up @@ -117,7 +117,7 @@ messages
quit
END_OF_DATA

run_bareos
run_bconsole
check_for_zombie_jobs storage=tape
stop_bareos

Expand Down
8 changes: 4 additions & 4 deletions tests/scsi-crypto-test
Expand Up @@ -67,7 +67,7 @@ status storage=tape
quit
END_OF_DATA

run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 2 done"
Expand All @@ -87,7 +87,7 @@ status storage=tape
quit
END_OF_DATA

run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 3 done"
Expand All @@ -106,7 +106,7 @@ messages
status storage=tape
quit
END_OF_DATA
run_bareos
run_bconsole

scripts/check_for_zombie_jobs storage=tape
echo "Backup 4 done"
Expand Down Expand Up @@ -141,7 +141,7 @@ status storage=tape
quit
END_OF_DATA

run_bareos
run_bconsole
check_for_zombie_jobs storage=tape
stop_bareos

Expand Down
2 changes: 1 addition & 1 deletion tests/truncate-bug-tape
Expand Up @@ -23,7 +23,7 @@ messages
label storage=tape volume=TestVolume001 slot=0 pool=Default
@# do a bunch of saves so we have 12 files on the tape
@#setdebug level=100 dir
setdebug level=100 storage=tape
@#setdebug level=100 storage=tape
run job=$JobName yes
run level=Full job=$JobName yes
run level=Full job=$JobName yes
Expand Down

0 comments on commit 3ca60f4

Please sign in to comment.