From 0dc94df93c7aa43d306cc0fc815761c6e5250137 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 6 Dec 2006 18:22:53 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3761 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/all-non-root-tests | 1 + regress/scripts/new-test-bacula-dir.conf.in | 14 ------ regress/tests/bscan-fast-tape | 2 +- regress/tests/compress-encrypt-test | 50 +++++++++++++++++++++ regress/tests/data-encrypt-test | 10 ++++- regress/tests/migration-volume-test | 4 +- regress/tests/restore-seek-tape | 2 +- regress/tests/sparse-encrypt-test | 5 +-- regress/tests/two-volume-test | 2 +- regress/tests/win32-to-linux-tape | 2 +- 10 files changed, 68 insertions(+), 24 deletions(-) create mode 100755 regress/tests/compress-encrypt-test diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests index 5d413d9e8f..783c887981 100755 --- a/regress/all-non-root-tests +++ b/regress/all-non-root-tests @@ -11,6 +11,7 @@ tests/bextract-test tests/bscan-test tests/bsr-opt-test tests/compressed-test +tests/compressed-encrypt-test tests/concurrent-jobs-test tests/data-encrypt-test #tests/sparse-encrypt-test diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in index 6e0cb2fafd..bd0f6dc576 100644 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -40,20 +40,6 @@ Job { SpoolData=yes } -Job { - Name = "Crypto" - Type = Backup - Client=@hostname@-fd - FileSet="SparseCompressedSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData=yes -} - - Job { Name = "MonsterSave" Type = Backup diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape index fcb7e921ba..2c8121896d 100755 --- a/regress/tests/bscan-fast-tape +++ b/regress/tests/bscan-fast-tape @@ -8,7 +8,7 @@ TestName="bscan-tape" JobName=bscantape . scripts/functions -set_debug 1 +set_debug 0 copy_tape_confs diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test new file mode 100755 index 0000000000..ac5d9b5a3c --- /dev/null +++ b/regress/tests/compress-encrypt-test @@ -0,0 +1,50 @@ +#!/bin/sh +# +# Run a simple backup with encryption and compression of the Bacula build directory +# then verify the signatures. +# +TestName="compressed-encrypt-test" +JobName=CompressedTest +. scripts/functions +set_debug 1 + +scripts/cleanup +scripts/copy-crypto-confs +echo "${cwd}/build" >/tmp/file-list + +start_test + +cat <tmp/bconcmds +@$out /dev/null +messages +@$out tmp/log1.out +label storage=File volume=TestVolume001 +setdebug level=10 fd +run job=$JobName yes +wait +messages +list volumes +@# +@# now do a restore +@# +@$out tmp/log2.out +@# setdebug level=0 fd +restore where=${cwd}/tmp/bacula-restores storage=File +5 +mark * +done +yes +wait +messages +@$out +quit +END_OF_DATA + +run_bacula +sleep 2 +check_for_zombie_jobs storage=File +stop_bacula + +check_two_logs +check_restore_diff +end_test diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test index 20e868b055..16f4e6a5b2 100755 --- a/regress/tests/data-encrypt-test +++ b/regress/tests/data-encrypt-test @@ -1,7 +1,8 @@ #!/bin/sh # -# Run a simple backup (with encryption) of the Bacula build directory -# then verify the signatures. +# Run a simple backup with encryption and no other options +# (i.e. no compression and no sparse handling) of the +# Bacula build directory. # TestName="data-encrypt-test" JobName=Crypto @@ -12,6 +13,7 @@ scripts/cleanup scripts/copy-crypto-confs echo "${cwd}/build" >/tmp/file-list +change_jobname NightlySave $JobName start_test cat <tmp/bconcmds @@ -44,6 +46,10 @@ sleep 2 check_for_zombie_jobs storage=File stop_bacula +du -s build +du -s tmp/bacula-restores/ + + check_two_logs check_restore_diff end_test diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test index aa00d0ce89..ac782cab20 100755 --- a/regress/tests/migration-volume-test +++ b/regress/tests/migration-volume-test @@ -8,7 +8,7 @@ TestName="migration-volume-test" JobName=MigVolBackup . scripts/functions -set_debug 1 +set_debug 0 . config.out @@ -89,6 +89,8 @@ run_bacula check_for_zombie_jobs storage=File stop_bacula +exit + check_two_logs check_restore_diff end_test diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape index b86b75d9e1..fe3fe3c42b 100755 --- a/regress/tests/restore-seek-tape +++ b/regress/tests/restore-seek-tape @@ -9,7 +9,7 @@ TestName="restore-seek-tape" JobName=restore-tape-seek . scripts/functions -set_debug 1 +set_debug 0 copy_tape_confs echo "${cwd}/tmp/build" >/tmp/file-list diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test index 3893dae71a..fdc88cc697 100755 --- a/regress/tests/sparse-encrypt-test +++ b/regress/tests/sparse-encrypt-test @@ -1,12 +1,11 @@ #!/bin/sh # -# Run a simple backup (with encryption) of the Bacula build directory -# then verify the signatures. +# Run a simple backup with encryption and a real sparse file. # TestName="sparse-encrypt-test" JobName=Crypto . scripts/functions -set_debug 1 +set_debug 0 scripts/cleanup scripts/copy-crypto-confs diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index 484fd958f1..7c2c51ad67 100755 --- a/regress/tests/two-volume-test +++ b/regress/tests/two-volume-test @@ -10,7 +10,7 @@ TestName="two-volume-test" JobName=TwoVolume . scripts/functions -set_debug 1 +set_debug 0 . config.out cwd=`pwd` diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape index 780c7dfb8c..5640e9f9ec 100755 --- a/regress/tests/win32-to-linux-tape +++ b/regress/tests/win32-to-linux-tape @@ -7,7 +7,7 @@ TestName="win32-to-linux-tape" JobName=AutoLabel . scripts/functions -set_debug 1 +set_debug 0 scripts/copy-win32-confs scripts/cleanup-tape -- 2.39.5