diff options
| author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-16 19:28:33 +0000 |
|---|---|---|
| committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-07-16 19:28:33 +0000 |
| commit | 58c38700ed37a7e69bd2cfcc1b5508f843b86cf1 (patch) | |
| tree | c65d253d98400a7156fd9c1bc97bdfa7e101639c /rdiff-backup/testing | |
| parent | a6220370a12ca72b6ddad9627fa77e19d16a7b1a (diff) | |
| download | rdiff-backup-58c38700ed37a7e69bd2cfcc1b5508f843b86cf1.tar.gz | |
Mostly tweaks to get the test cases to work
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@337 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/testing')
| -rw-r--r-- | rdiff-backup/testing/commontest.py | 5 | ||||
| -rw-r--r-- | rdiff-backup/testing/test1/tmp/placeholder | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py index 4cda300..f80da59 100644 --- a/rdiff-backup/testing/commontest.py +++ b/rdiff-backup/testing/commontest.py @@ -128,6 +128,7 @@ def InternalRestore(mirror_local, dest_local, mirror_dir, dest_dir, time): """ Main.force = 1 + Main.restore_root_set = 0 remote_schema = '%s' #_reset_connections() if not mirror_local: @@ -221,7 +222,7 @@ def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, Log("%s: %s" % (dest_rorp.index, Hardlink.get_indicies(dest_rorp, None)), 3) return None - if compare_eas and not eas_acls.compare_rps(src_rorp, dest_rorp): + if compare_eas and not eas_acls.ea_compare_rps(src_rorp, dest_rorp): Log("Different EAs in files %s and %s" % (src_rorp.get_indexpath(), dest_rorp.get_indexpath()), 3) return None @@ -240,7 +241,7 @@ def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, if dest_rorp.index[-1].endswith('gz'): return 1 # Don't compare .missing increments because they don't matter if dest_rorp.index[-1].endswith('.missing'): return 1 - if compare_eas and not eas_acls.compare_rps(src_rorp, dest_rorp): + if compare_eas and not eas_acls.ea_compare_rps(src_rorp, dest_rorp): Log("Different EAs in files %s and %s" % (src_rorp.get_indexpath(), dest_rorp.get_indexpath())) return None diff --git a/rdiff-backup/testing/test1/tmp/placeholder b/rdiff-backup/testing/test1/tmp/placeholder new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/rdiff-backup/testing/test1/tmp/placeholder |