From c6763f341fdf382b28479088e6a9bd59921f8c3a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 8 Jun 2004 14:39:52 +0000 Subject: [PATCH] Update tests git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1395 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/all-non-root-tape-tests | 1 + regress/scripts/.cvsignore | 1 + regress/scripts/bacula-sd-tape.conf.in | 1 + regress/scripts/copy-test-confs | 2 +- regress/scripts/do_sed | 1 + regress/scripts/new-test-bacula-dir.conf.in | 311 ++++++++++++++++++++ regress/tests/btape-fill-tape | 43 +++ regress/tests/compressed-test | 2 +- 8 files changed, 360 insertions(+), 2 deletions(-) create mode 100644 regress/scripts/new-test-bacula-dir.conf.in create mode 100755 regress/tests/btape-fill-tape diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests index b10c8babc8..7af5fbf961 100755 --- a/regress/all-non-root-tape-tests +++ b/regress/all-non-root-tape-tests @@ -11,6 +11,7 @@ tests/four-concurrent-jobs-tape tests/four-jobs-tape tests/fixed-block-size-tape tests/bscan-tape +tests/btape-fill-tape echo " " echo " " echo "Test results" diff --git a/regress/scripts/.cvsignore b/regress/scripts/.cvsignore index 8d7e0007c7..002e974d47 100644 --- a/regress/scripts/.cvsignore +++ b/regress/scripts/.cvsignore @@ -1,3 +1,4 @@ +new-test-bacula-dir.conf bacula-dir.conf bacula-fd.conf bacula-sd.conf diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in index b794de4c25..62023f24df 100644 --- a/regress/scripts/bacula-sd-tape.conf.in +++ b/regress/scripts/bacula-sd-tape.conf.in @@ -41,6 +41,7 @@ Device { RemovableMedia = yes; @@sbindir@/tape_options # Maximum File Size = 1000000 +# MaximumVolumeSize = 100M } # diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs index 02a1b702ff..61b120f610 100755 --- a/regress/scripts/copy-test-confs +++ b/regress/scripts/copy-test-confs @@ -1,5 +1,5 @@ #!/bin/sh -/bin/cp -f scripts/test-bacula-dir.conf bin/bacula-dir.conf +/bin/cp -f scripts/new-test-bacula-dir.conf bin/bacula-dir.conf /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf /bin/cp -f scripts/test-console.conf bin/bconsole.conf diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index cb92d78344..47a2d3b820 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -28,6 +28,7 @@ echo "s%@changer_path@%${4}%g" >>${out} # process .in files with sed script sed -f ${out} ${cwd}/scripts/test-bacula-dir.conf.in >${cwd}/scripts/test-bacula-dir.conf +sed -f ${out} ${cwd}/scripts/new-test-bacula-dir.conf.in >${cwd}/scripts/new-test-bacula-dir.conf sed -f ${out} ${cwd}/scripts/testa-bacula-dir.conf.in >${cwd}/scripts/testa-bacula-dir.conf sed -f ${out} ${cwd}/scripts/test-bacula-fd.conf.in >${cwd}/scripts/test-bacula-fd.conf sed -f ${out} ${cwd}/scripts/test-bacula-sd.conf.in >${cwd}/scripts/test-bacula-sd.conf diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in new file mode 100644 index 0000000000..a9081e9eca --- /dev/null +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -0,0 +1,311 @@ +# +# Default Bacula Director Configuration file +# +# The only thing that MUST be changed is to add one or more +# file or directory names in the Include directive of the +# FileSet resource. +# +# For Bacula release 1.33 +# +# You might also want to change the default email address +# from root to your address. See the "mail" and "operator" +# directives in the Messages resource. +# + +Director { # define myself + Name = @hostname@-dir + DIRport = 8101 # where we listen for UA connections + QueryFile = "@scriptdir@/query.sql" + WorkingDirectory = "@working_dir@" + PidDirectory = "@piddir@" + SubSysDirectory = "@subsysdir@" + Maximum Concurrent Jobs = 4 + Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password + Messages = Standard +} + +# +# Define the main nightly save backup job +# By default, this job will back up to disk in /tmp +Job { + Name = "NightlySave" + Type = Backup + Client=@hostname@-fd + FileSet="Full Set" + Storage = File + Messages = Standard + Pool = Default + Write Bootstrap = "@working_dir@/NightlySave.bsr" + Maximum Concurrent Jobs = 4 + SpoolData=yes +} + +Job { + Name = "MonsterSave" + Type = Backup + Client=@hostname@-fd + FileSet="Full Set" + Storage = File1 + Messages = Standard + Pool = Default + Write Bootstrap = "@working_dir@/NightlySave.bsr" +} + + +Job { + Name = "VerifyVolume" + Type = Verify + Level = VolumeToCatalog + Client=@hostname@-fd + FileSet="Full Set" + Storage = File + Messages = Standard + Pool = Default + Write Bootstrap = "@working_dir@/NightlySave.bsr" +} + + +Job { + Name = "SparseTest" + Type = Backup + Client=@hostname@-fd + FileSet="SparseSet" + Storage = File + Messages = Standard + Pool = Default + Write Bootstrap = "@working_dir@/NightlySave.bsr" +} + +Job { + Name = "CompressedTest" + Type = Backup + Client=@hostname@-fd + FileSet="CompressedSet" + Storage = File + Messages = Standard + Pool = Default + Maximum Concurrent Jobs = 4 + Write Bootstrap = "@working_dir@/NightlySave.bsr" +} + +Job { + Name = "SparseCompressedTest" + Type = Backup + Client=@hostname@-fd + FileSet="SparseCompressedSet" + Storage = File + Messages = Standard + Pool = Default + Write Bootstrap = "@working_dir@/NightlySave.bsr" +} + + +# Backup the catalog database (after the nightly save) +Job { + Name = "BackupCatalog" + Type = Backup + Client=@hostname@-fd + FileSet="Catalog" +# Schedule = "WeeklyCycleAfterBackup" + Storage = File + Messages = Standard + Pool = Default + # This creates an ASCII copy of the catalog + RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula" + # This deletes the copy of the catalog + RunAfterJob = "@sbindir@/delete_catalog_backup" + Write Bootstrap = "@working_dir@/BackupCatalog.bsr" +} + +# Standard Restore template, to be changed by Console program +Job { + Name = "RestoreFiles" + Type = Restore + Client=@hostname@-fd + FileSet="Full Set" + Storage = File + Messages = Standard + Pool = Default + Where = /tmp/bacula-restores +} + + +# List of files to be backed up +FileSet { + Name = "Full Set" + Include = signature=MD5 { + &1 >/dev/null +scripts/copy-tape-confs +scripts/cleanup-tape +echo "${cwd}/build" >/tmp/file-list +cd bin +./drop_bacula_tables >/dev/null 2>&1 +./make_bacula_tables >/dev/null 2>&1 +./grant_bacula_privileges 2>&1 >/dev/null +cd .. +cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 +sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf + +echo " " +echo " " +echo " === Starting btape fill test ===" +echo " === Starting btape fill test ===" >>working/log +echo " " + +bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out +fill +s + +quit +END_OF_DATA + + +grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null +if [ $? != 0 ] ; then + echo " " + echo " " + echo " !!!!! btape fill test failed!!! !!!!! " + echo " !!!!! btape fill test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== btape fill test OK ===== " + echo " ===== btape fill test OK ===== " >>test.out +# scripts/cleanup +fi diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 983c114e27..d600c1e19a 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -28,7 +28,7 @@ status all messages @output tmp/log1.out label storage=File volume=TestVolume001 -run job=CompressedTest yes +run job=CompressedTest storage=File yes wait messages @# -- 2.39.5