From 716fa96b9cbf2570e381de0abb475d341487c2d6 Mon Sep 17 00:00:00 2001 From: bescoto Date: Tue, 18 Feb 2003 08:18:45 +0000 Subject: 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 --- rdiff-backup/testing/commontest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'rdiff-backup/testing/commontest.py') 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 -- cgit v1.2.1