diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-08-27 20:18:22 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-08-27 20:18:22 +0000 |
| commit | 9e9ac86ba4d50979975b624ce3948a1011af3fd1 (patch) | |
| tree | 7e7b233f9715ac00ab78ff72d0df99fcd3b55d65 /rdiff-backup/testing | |
| parent | a1a2ba7783c700cd73b640cac7388fa6c733bf8b (diff) | |
| download | rdiff-backup-9e9ac86ba4d50979975b624ce3948a1011af3fd1.tar.gz | |
Fixed various --restrict options, some refactoring
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@407 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/testing')
| -rw-r--r-- | rdiff-backup/testing/finaltest.py | 12 | ||||
| -rw-r--r-- | rdiff-backup/testing/regressiontest.py | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/rdiff-backup/testing/finaltest.py b/rdiff-backup/testing/finaltest.py index 4f1caf9..85f3378 100644 --- a/rdiff-backup/testing/finaltest.py +++ b/rdiff-backup/testing/finaltest.py @@ -272,6 +272,12 @@ class Final(PathSetter): # Back up increment3 self.exec_rb(30000, 'testfiles/win-increment3', 'testfiles/output') + # Now check to make sure no ":" in output directory + popen_fp = os.popen("find testfiles/output -name '*:*' | wc") + wc_output = popen_fp.read() + popen_fp.close() + assert wc_output.split() == ["0", "0", "0"], wc_output + # Start restore of increment 2 Globals.chars_to_quote = '^a-z0-9_ -.' inc_paths = self.getinc_paths("increments.", @@ -289,12 +295,6 @@ class Final(PathSetter): compare_hardlinks = 0) self.rb_schema = old_schema - # Now check to make sure no ":" in output directory - popen_fp = os.popen("find testfiles/output -name '*:*' | wc") - wc_output = popen_fp.read() - popen_fp.close() - assert wc_output.split() == ["0", "0", "0"], wc_output - def testLegacy(self): """Test restoring directory with no mirror_metadata file""" self.delete_tmpdirs() diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py index c135387..a7db21c 100644 --- a/rdiff-backup/testing/regressiontest.py +++ b/rdiff-backup/testing/regressiontest.py @@ -386,8 +386,9 @@ class MirrorTest(PathSetter): assert not rpout.append("rdiff-backup-data").lstat() Main.misc_setup([rpin, rpout]) Main.backup_check_dirs(rpin, rpout) - Main.backup_set_fs_globals(rpin, rpout) Main.backup_set_rbdir(rpin, rpout) + Main.backup_set_fs_globals(rpin, rpout) + Main.backup_final_init(rpout) Main.backup_set_select(rpin) backup.Mirror(rpin, rpout) log.ErrorLog.close() |