[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] SF.net SVN: bacula:[7663] trunk/regress
From:       kerns () users ! sourceforge ! net
Date:       2008-09-29 14:48:22
Message-ID: E1KkK2w-0004f3-JY () d5vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 7663
          http://bacula.svn.sourceforge.net/bacula/?rev=7663&view=rev
Author:   kerns
Date:     2008-09-29 14:48:20 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
Improve plugin test -- more to be done

Modified Paths:
--------------
    trunk/regress/scripts/plugin-test-bacula-dir.conf.in
    trunk/regress/tests/plugin-test

Modified: trunk/regress/scripts/plugin-test-bacula-dir.conf.in
===================================================================
--- trunk/regress/scripts/plugin-test-bacula-dir.conf.in	2008-09-29 08:01:42 UTC (rev \
                7662)
+++ trunk/regress/scripts/plugin-test-bacula-dir.conf.in	2008-09-29 14:48:20 UTC (rev \
7663) @@ -223,6 +223,7 @@
     }
     File = <@tmpdir@/file-list
     Plugin = "bpipe:/@bpipe@/encrypt-bug.jpg:cat @builddir@/../encrypt-bug.jpg:cat \
>@tmpdir@/encrypt-bug.jpg" +    Plugin = "bpipe:/@bpipe@/Makefile:cat \
> @builddir@/../Makefile:cat >@tmpdir@/Makefile"
   }
 }
 

Modified: trunk/regress/tests/plugin-test
===================================================================
--- trunk/regress/tests/plugin-test	2008-09-29 08:01:42 UTC (rev 7662)
+++ trunk/regress/tests/plugin-test	2008-09-29 14:48:20 UTC (rev 7663)
@@ -9,7 +9,8 @@
 scripts/cleanup
 scripts/copy-plugin-confs
 file=encrypt-bug.jpg
-echo "${cwd}/${file}" >${cwd}/tmp/file-list
+rm -rf ${cwd}/tmp/*
+echo "${cwd}/README" >${cwd}/tmp/file-list
 
 start_test
 
@@ -29,7 +30,6 @@
 run_bacula -d50
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
 messages
 @# 
 @# now do a restore
@@ -44,13 +44,48 @@
 quit
 END_OF_DATA
 
+run_bconsole
 
+stop_bacula
+
+# ****FIXME**** test if the restore of the two files is OK
+
+#
+# Remove plugin so we can try the restore without the plugin
+#
+mv -f ${cwd}/bin/plugins/bpipe-fd.so ${cwd}/bin/plugins/bpipe-fd.sox
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out ${cwd}/tmp/log2.out
+@# remove plugin
+@exec "sh -c 'rm -f ${cwd}/bin/plugins/bpipe-fd.so'"
+@# 
+@# now do a restore without the plugin
+@#
+@$out ${cwd}/tmp/log2.out
+@#setdebug level=50 client=$CLIENT
+restore where=${cwd}/tmp  select all storage=File1 done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula -d50
 run_bconsole
 
 check_for_zombie_jobs storage=File1
 stop_bacula
+#
+# Restore plugin
+#
+mv -f ${cwd}/bin/plugins/bpipe-fd.sox ${cwd}/bin/plugins/bpipe-fd.so
 
 check_two_logs
+#
+# ****FIXME**** test that all three files are restored correctly
+#
 diff ${cwd}/${file} ${cwd}/tmp/${file}
 dstat=$?
 end_test


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits


[prev in list] [next in list] [prev in thread] [next in thread]