From 60b06b8d32cf68bac1a6259e62976527862d68e8 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 13 Feb 2009 14:53:37 -0700 Subject: [PATCH] test_dirnode: #625 run deep-check on a readonly dirnode too --- src/allmydata/test/test_dirnode.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py index 17fa9fee..d468cb8d 100644 --- a/src/allmydata/test/test_dirnode.py +++ b/src/allmydata/test/test_dirnode.py @@ -149,6 +149,7 @@ class Dirnode(unittest.TestCase, # root/subdir/ # root/subdir/file1 # root/subdir/link -> root + # root/rodir d = self.client.create_empty_dirnode() def _created_root(rootnode): self._rootnode = rootnode @@ -158,6 +159,10 @@ class Dirnode(unittest.TestCase, self._subdir = subdir d = subdir.add_file(u"file1", upload.Data("data", None)) d.addCallback(lambda res: subdir.set_node(u"link", self._rootnode)) + d.addCallback(lambda res: self.client.create_empty_dirnode()) + d.addCallback(lambda dn: + self._rootnode.set_uri(u"rodir", + dn.get_readonly_uri())) return d d.addCallback(_created_subdir) def _done(res): @@ -172,14 +177,14 @@ class Dirnode(unittest.TestCase, self.failUnless(IDeepCheckResults.providedBy(r)) c = r.get_counters() self.failUnlessEqual(c, - {"count-objects-checked": 3, - "count-objects-healthy": 3, + {"count-objects-checked": 4, + "count-objects-healthy": 4, "count-objects-unhealthy": 0, "count-objects-unrecoverable": 0, "count-corrupt-shares": 0, }) self.failIf(r.get_corrupt_shares()) - self.failUnlessEqual(len(r.get_all_results()), 3) + self.failUnlessEqual(len(r.get_all_results()), 4) d.addCallback(_check_results) return d @@ -191,12 +196,12 @@ class Dirnode(unittest.TestCase, self.failUnless(IDeepCheckAndRepairResults.providedBy(r)) c = r.get_counters() self.failUnlessEqual(c, - {"count-objects-checked": 3, - "count-objects-healthy-pre-repair": 3, + {"count-objects-checked": 4, + "count-objects-healthy-pre-repair": 4, "count-objects-unhealthy-pre-repair": 0, "count-objects-unrecoverable-pre-repair": 0, "count-corrupt-shares-pre-repair": 0, - "count-objects-healthy-post-repair": 3, + "count-objects-healthy-post-repair": 4, "count-objects-unhealthy-post-repair": 0, "count-objects-unrecoverable-post-repair": 0, "count-corrupt-shares-post-repair": 0, @@ -206,7 +211,7 @@ class Dirnode(unittest.TestCase, }) self.failIf(r.get_corrupt_shares()) self.failIf(r.get_remaining_corrupt_shares()) - self.failUnlessEqual(len(r.get_all_results()), 3) + self.failUnlessEqual(len(r.get_all_results()), 4) d.addCallback(_check_results) return d @@ -222,8 +227,8 @@ class Dirnode(unittest.TestCase, def _check_results(r): c = r.get_counters() self.failUnlessEqual(c, - {"count-objects-checked": 3, - "count-objects-healthy": 2, + {"count-objects-checked": 4, + "count-objects-healthy": 3, "count-objects-unhealthy": 1, "count-objects-unrecoverable": 0, "count-corrupt-shares": 0, -- 2.45.2