diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-02-18 08:18:45 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-02-18 08:18:45 +0000 |
commit | 716fa96b9cbf2570e381de0abb475d341487c2d6 (patch) | |
tree | 5704e34ef06a6750e39522fe051cd1dd7047dde2 /rdiff-backup/testing/commontest.py | |
parent | 0ad90ffd146e3ed6c920772c4a9542198d8059bc (diff) | |
download | rdiff-backup-716fa96b9cbf2570e381de0abb475d341487c2d6.tar.gz |
Various modifications to backup, restore, and regress systems.
This version passes many tests but not all of them. The backup patch
system was copied to restore.py.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@281 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/testing/commontest.py')
-rw-r--r-- | rdiff-backup/testing/commontest.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py index 57aad7b..c527e83 100644 --- a/rdiff-backup/testing/commontest.py +++ b/rdiff-backup/testing/commontest.py @@ -5,6 +5,7 @@ from rdiff_backup.rpath import RPath from rdiff_backup import Globals, Hardlink, SetConnections, Main, \ selection, lazy, Time, rpath +RBBin = "../rdiff-backup" SourceDir = "../rdiff_backup" AbsCurdir = os.getcwd() # Absolute path name of current directory AbsTFdir = AbsCurdir+"/testfiles" @@ -56,12 +57,14 @@ def rdiff_backup(source_local, dest_local, src_dir, dest_dir, dest_dir = ("test2/tmp; ../../%s/rdiff-backup --server::../../%s" % (SourceDir, dest_dir)) - cmdargs = [SourceDir + "/rdiff-backup", extra_options] + cmdargs = [RBBin, extra_options] if not (source_local and dest_local): cmdargs.append("--remote-schema %s") if current_time: cmdargs.append("--current-time %s" % current_time) - - os.system(" ".join(cmdargs)) + cmdargs.extend([src_dir, dest_dir]) + cmdline = " ".join(cmdargs) + print "Executing: ", cmdline + assert not os.system(cmdline) def cmd_schemas2rps(schema_list, remote_schema): """Input list of file descriptions and the remote schema, return rps |