Commit 14e938de authored by bescoto's avatar bescoto

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@599 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 54aac262
...@@ -446,7 +446,7 @@ class FinalMisc(PathSetter): ...@@ -446,7 +446,7 @@ class FinalMisc(PathSetter):
class FinalSelection(PathSetter): class FinalSelection(PathSetter):
"""Test selection options""" """Test selection options"""
def run(self, cmd): def system(self, cmd):
print "Executing: ", cmd print "Executing: ", cmd
assert not os.system(cmd) assert not os.system(cmd)
...@@ -456,7 +456,7 @@ class FinalSelection(PathSetter): ...@@ -456,7 +456,7 @@ class FinalSelection(PathSetter):
# Test --include option # Test --include option
assert not \ assert not \
os.system(self.rb_schema + self.system(self.rb_schema +
"--current-time 10000 " "--current-time 10000 "
"--include testfiles/increment2/various_file_types " "--include testfiles/increment2/various_file_types "
"--exclude '**' " "--exclude '**' "
...@@ -485,11 +485,11 @@ testfiles/increment2/changed_dir""") ...@@ -485,11 +485,11 @@ testfiles/increment2/changed_dir""")
# Test selective restoring # Test selective restoring
mirror_rp = rpath.RPath(Globals.local_connection, "testfiles/output") mirror_rp = rpath.RPath(Globals.local_connection, "testfiles/output")
restore_filename = get_increment_rp(mirror_rp, 10000).path restore_filename = get_increment_rp(mirror_rp, 10000).path
self.run(self.rb_schema + self.system(self.rb_schema +
"--include testfiles/restoretarget1/various_file_types/" "--include testfiles/restoretarget1/various_file_types/"
"regular_file " "regular_file "
"--exclude '**' " + "--exclude '**' " +
restore_filename + " testfiles/restoretarget1") restore_filename + " testfiles/restoretarget1")
assert os.lstat("testfiles/restoretarget1/various_file_types/" assert os.lstat("testfiles/restoretarget1/various_file_types/"
"regular_file") "regular_file")
self.assertRaises(OSError, os.lstat, "testfiles/restoretarget1/tester") self.assertRaises(OSError, os.lstat, "testfiles/restoretarget1/tester")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment