summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-07 17:43:46 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-07 17:43:46 +0000
commit268460065af46ce3450b80fae2d5b6e9dd114d2c (patch)
treeefbcecfd29bea92a9b1a7d5d78e1644d3801f4e3
parent6e8704ae39fd79ad414fd90c713e7c7ee4415a59 (diff)
downloadrdiff-backup-268460065af46ce3450b80fae2d5b6e9dd114d2c.tar.gz
Renamed a function so the tests FinalSelection work again. It
appeared to break because of a recent change in the internals of the unittest module. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@599 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/testing/finaltest.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/rdiff-backup/testing/finaltest.py b/rdiff-backup/testing/finaltest.py
index f499583..52319d7 100644
--- a/rdiff-backup/testing/finaltest.py
+++ b/rdiff-backup/testing/finaltest.py
@@ -446,7 +446,7 @@ class FinalMisc(PathSetter):
class FinalSelection(PathSetter):
"""Test selection options"""
- def run(self, cmd):
+ def system(self, cmd):
print "Executing: ", cmd
assert not os.system(cmd)
@@ -456,7 +456,7 @@ class FinalSelection(PathSetter):
# Test --include option
assert not \
- os.system(self.rb_schema +
+ self.system(self.rb_schema +
"--current-time 10000 "
"--include testfiles/increment2/various_file_types "
"--exclude '**' "
@@ -485,11 +485,11 @@ testfiles/increment2/changed_dir""")
# Test selective restoring
mirror_rp = rpath.RPath(Globals.local_connection, "testfiles/output")
restore_filename = get_increment_rp(mirror_rp, 10000).path
- self.run(self.rb_schema +
- "--include testfiles/restoretarget1/various_file_types/"
- "regular_file "
- "--exclude '**' " +
- restore_filename + " testfiles/restoretarget1")
+ self.system(self.rb_schema +
+ "--include testfiles/restoretarget1/various_file_types/"
+ "regular_file "
+ "--exclude '**' " +
+ restore_filename + " testfiles/restoretarget1")
assert os.lstat("testfiles/restoretarget1/various_file_types/"
"regular_file")
self.assertRaises(OSError, os.lstat, "testfiles/restoretarget1/tester")