From dd23f265bf33daf6d44db1abd41e1db299c2b2c8 Mon Sep 17 00:00:00 2001 From: david-sarah Date: Wed, 10 Aug 2011 13:29:42 -0700 Subject: [PATCH] More idiomatic resolution of the conflict between ticket393-MDMF-2 and trunk. refs #393 --- src/allmydata/test/test_dirnode.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py index 5dcbc179..be0b42e6 100644 --- a/src/allmydata/test/test_dirnode.py +++ b/src/allmydata/test/test_dirnode.py @@ -593,7 +593,6 @@ class Dirnode(GridTestMixin, unittest.TestCase, u"empty_litdir": (nm.create_from_cap(empty_litdir_uri), {}), u"tiny_litdir": (nm.create_from_cap(tiny_litdir_uri), {}), } - d = None if mdmf: d = c.create_dirnode(kids, version=MDMF_VERSION) else: @@ -616,6 +615,7 @@ class Dirnode(GridTestMixin, unittest.TestCase, rep = str(dn) self.failUnless("RW-MUT" in rep) return dn.list() + d.addCallback(_created) def _check_kids(children): self.failUnlessReallyEqual(set(children.keys()), @@ -680,7 +680,6 @@ class Dirnode(GridTestMixin, unittest.TestCase, d2.addCallback(lambda children: children[u"short"][0].read(MemAccum())) d2.addCallback(lambda accum: self.failUnlessReallyEqual(accum.data, "The end.")) return d2 - d.addCallback(_created) d.addCallback(_check_kids) d.addCallback(lambda ign: nm.create_new_mutable_directory(kids)) -- 2.45.2