SF.net SVN: safekeep: [448] safekeep/trunk/safekeep-test

[<di...@us...>]

Revision: 448
          http://safekeep.svn.sourceforge.net/safekeep/?rev=448&view=rev
Author:   dimi
Date:     2007-03-08 13:46:05 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
Make use of the new config files to avoid the deprecation warning in tests

Modified Paths:
--------------
    safekeep/trunk/safekeep-test

Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2007-03-08 20:56:12 UTC (rev 447)
+++ safekeep/trunk/safekeep-test	2007-03-08 21:46:05 UTC (rev 448)
@@ -119,12 +119,17 @@
 
 def localTest(tmproot):
     params = {'tmproot': tmproot, 'args': safekeep_args}
+    os.mkdir(os.path.join(tmproot, 'clients.d'))
     os.mkdir(os.path.join(tmproot, 'client'))
     os.mkdir(os.path.join(tmproot, 'client', 'data'))
     os.mkdir(os.path.join(tmproot, 'client', 'home'))
     os.mkdir(os.path.join(tmproot, 'client', 'misc'))
     os.mkdir(os.path.join(tmproot, 'server'))
     CONFIG = """
+        # Default values should do for now
+    """
+    writefile(os.path.join(tmproot, 'safekeep.conf'), CONFIG % params)
+    BACKUP = """
        <backup id="%(tmproot)s">
           <repo path="%(tmproot)s/server" />
           <data>
@@ -133,7 +138,7 @@
           </data>
         </backup>
     """
-    writefile(os.path.join(tmproot, 'test.backup'), CONFIG % params)
+    writefile(os.path.join(tmproot, 'clients.d', 'test.backup'), BACKUP % params)
     for i in xrange(test_reps):
         FILES = (
             'data/fileA.out', 
@@ -149,7 +154,7 @@
         cmd = "cd %(tmproot)s/client; find -type f -a \! -name '*.nobackup' | sort | xargs md5sum > %(tmproot)s/md5sums.client"
         if os.system(cmd % params):
             raise TestFailure("Can't compute the source MD5 sums")
-        cmd = "safekeep %(args)s --conf '%(tmproot)s/test.backup'"
+        cmd = "safekeep %(args)s --conf '%(tmproot)s/safekeep.conf'"
         if os.system(cmd % params):
             raise TestFailure("Can't backup files")
         os.mkdir(os.path.join(tmproot, 'restore'))


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