From: <ke...@us...> - 2007-02-19 17:51:34
|
Revision: 4211 http://bacula.svn.sourceforge.net/bacula/?rev=4211&view=rev Author: kerns Date: 2007-02-19 09:51:35 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Implement socket restore test Modified Paths: -------------- trunk/regress/all-non-root-tests trunk/regress/tests/encrypt-bug-test trunk/regress/tests/sparse-encrypt-test trunk/regress/tests/weird-files-test trunk/regress/tests/weird-files2-test trunk/regress/weird-files.tar.gz Added Paths: ----------- trunk/regress/encrypt-bug.jpg Modified: trunk/regress/all-non-root-tests =================================================================== --- trunk/regress/all-non-root-tests 2007-02-19 17:20:55 UTC (rev 4210) +++ trunk/regress/all-non-root-tests 2007-02-19 17:51:35 UTC (rev 4211) @@ -14,6 +14,10 @@ tests/compress-encrypt-test tests/concurrent-jobs-test tests/data-encrypt-test +tests/encrypt-bug-test +# The following two can uses *lots* of disk space +# so they are normally turned off, but if you have +# at least two GB free, you can run them #tests/sparse-encrypt-test #tests/gigaslam-sparse-test tests/differential-test Added: trunk/regress/encrypt-bug.jpg =================================================================== (Binary files differ) Property changes on: trunk/regress/encrypt-bug.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/regress/tests/encrypt-bug-test =================================================================== --- trunk/regress/tests/encrypt-bug-test 2007-02-19 17:20:55 UTC (rev 4210) +++ trunk/regress/tests/encrypt-bug-test 2007-02-19 17:51:35 UTC (rev 4211) @@ -6,11 +6,12 @@ TestName="encrypt-bug-test" JobName=Crypto-bug . scripts/functions -set_debug 1 +set_debug 0 scripts/cleanup scripts/copy-crypto-confs -echo "${cwd}/untitled15.jpg" >/tmp/file-list +file="${cwd}/encrypt-bug.jpg" +echo "${file}" >/tmp/file-list change_jobname NightlySave $JobName start_test @@ -20,7 +21,7 @@ messages @$out tmp/log1.out label storage=File volume=TestVolume001 -@#setdebug level=10 fd +setdebug level=100 fd run job=$JobName yes wait messages @@ -28,7 +29,7 @@ @# now do a restore @# @$out tmp/log2.out -@#setdebug level=10 fd +setdebug level=100 fd restore where=${cwd}/tmp/bacula-restores storage=File 5 mark * @@ -50,5 +51,6 @@ check_two_logs -check_restore_diff +diff ${file} ${cwd}/tmp/bacula-restores/${file} 2>&1 >/dev/null +dstat=$? end_test Modified: trunk/regress/tests/sparse-encrypt-test =================================================================== --- trunk/regress/tests/sparse-encrypt-test 2007-02-19 17:20:55 UTC (rev 4210) +++ trunk/regress/tests/sparse-encrypt-test 2007-02-19 17:51:35 UTC (rev 4211) @@ -52,10 +52,15 @@ check_for_zombie_jobs storage=File stop_bacula -size=`du ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif | cut -f 1` -if [ $size -gt 120 ]; then - echo "========== restored sparse file: gigaslam.gif too big =========" - echo " size is ${size}K it should be 120K" +if [ ! -f ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif ]; then + echo "============= file gigaslam.gif was not restored =======" + size=0 +else + size=`du ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif | cut -f 1` + if [ $size -gt 120 ]; then + echo "========== restored sparse file: gigaslam.gif too big =========" + echo " size is ${size}K it should be 120K" + fi fi check_two_logs Modified: trunk/regress/tests/weird-files-test =================================================================== --- trunk/regress/tests/weird-files-test 2007-02-19 17:20:55 UTC (rev 4210) +++ trunk/regress/tests/weird-files-test 2007-02-19 17:51:35 UTC (rev 4211) @@ -27,6 +27,11 @@ echo "${cwd}/weird-files" >/tmp/file-list echo "${cwd}/weird-files" >>/tmp/file-list +# Create a Unix domain socket (sock-file) +cd weird-files +perl socket.pl +cd .. + start_test cat <<END_OF_DATA >tmp/bconcmds @@ -57,6 +62,10 @@ run_bacula check_for_zombie_jobs storage=File stop_bacula +# Note, the Unix domain socket (sock-file) is not restored +# by Bacula so we delete it for the diffs +rm -f weird-files/sock-file +touch weird-files tmp/bacula-restores${cwd}/weird-files ${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original cd tmp/bacula-restores${cwd} @@ -64,6 +73,8 @@ cd ${cwd} check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null +#diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null +diff ${cwd}/tmp/original ${cwd}/tmp/restored + dstat=$? end_test Modified: trunk/regress/tests/weird-files2-test =================================================================== --- trunk/regress/tests/weird-files2-test 2007-02-19 17:20:55 UTC (rev 4210) +++ trunk/regress/tests/weird-files2-test 2007-02-19 17:51:35 UTC (rev 4211) @@ -19,11 +19,14 @@ rm -rf weird-files2 cp -Rp weird-files weird-files2 echo "${cwd}/weird-files2" >/tmp/file-list +cd weird-files2 +perl socket.pl +cd .. change_jobname NightlySave $JobName start_test -bin/testls weird-files2 >${cwd}/tmp/original +bin/testls weird-files2 | grep -v sock-file >${cwd}/tmp/original cat <<END_OF_DATA >tmp/bconcmds @$out /dev/null @@ -74,7 +77,8 @@ bin/testls weird-files2 >${cwd}/tmp/restored check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null +#diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null +diff ${cwd}/tmp/original ${cwd}/tmp/restored dstat=$? end_test Modified: trunk/regress/weird-files.tar.gz =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |