diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-12-21 06:35:08 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-12-21 06:35:08 +0000 |
| commit | e95a61773adb2f98499cf13ff543f4249ee38226 (patch) | |
| tree | 835e2cc34386eb6c798026ebf5acd1ea30a9c537 /rdiff-backup/testing | |
| parent | 5d3974dcd81e009293afe2372364983ad3810568 (diff) | |
| download | rdiff-backup-e95a61773adb2f98499cf13ff543f4249ee38226.tar.gz | |
Removed most destructive stepping operations
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@251 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/testing')
| -rw-r--r-- | rdiff-backup/testing/commontest.py | 12 | ||||
| -rw-r--r-- | rdiff-backup/testing/regressiontest.py | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py index 769187a..07b6648 100644 --- a/rdiff-backup/testing/commontest.py +++ b/rdiff-backup/testing/commontest.py @@ -173,8 +173,7 @@ def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, Log("Comparing %s and %s, hardlinks %s" % (src_rp.path, dest_rp.path, compare_hardlinks), 3) - src_select = Select(DSRPath(1, src_rp)) - dest_select = Select(DSRPath(None, dest_rp)) + src_select, dest_select = Select(src_rp), Select(dest_rp) if ignore_tmp_files: # Ignoring temp files can be useful when we want to check the @@ -201,13 +200,10 @@ def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, dest_select.add_selection_func(dest_select.glob_get_tuple_sf( ('rdiff-backup-data',), 0)) - src_select.set_iter() - dest_select.set_iter() - dsiter1, dsiter2 = src_select.iterate_with_finalizer(), \ - dest_select.iterate_with_finalizer() + dsiter1, dsiter2 = src_select.set_iter(), dest_select.set_iter() def hardlink_equal(src_rorp, dest_rorp): - if src_rorp != dest_rorp: return None + if not src_rorp.equal_verbose(dest_rorp): return None if Hardlink.rorp_eq(src_rorp, dest_rorp): return 1 Log("%s: %s" % (src_rorp.index, Hardlink.get_indicies(src_rorp, 1)), 3) Log("%s: %s" % (dest_rorp.index, @@ -229,7 +225,7 @@ def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, if dest_rorp.index[-1].endswith('.missing'): return 1 if compare_hardlinks: if Hardlink.rorp_eq(src_rorp, dest_rorp): return 1 - elif src_rorp == dest_rorp: return 1 + elif src_rorp.equal_verbose(dest_rorp): return 1 Log("%s: %s" % (src_rorp.index, Hardlink.get_indicies(src_rorp, 1)), 3) Log("%s: %s" % (dest_rorp.index, Hardlink.get_indicies(dest_rorp, None)), 3) diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py index 196d5ae..e881b63 100644 --- a/rdiff-backup/testing/regressiontest.py +++ b/rdiff-backup/testing/regressiontest.py @@ -14,7 +14,7 @@ testfiles Globals.set('change_source_perms', 1) Globals.counter = 0 -Log.setverbosity(3) +Log.setverbosity(7) class Local: """This is just a place to put increments relative to the local |