More idiomatic resolution of the conflict between ticket393-MDMF-2 and trunk. refs...

diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py
index 5dcbc1790e41758f2e1f25ec33190a1c0815e2d7..be0b42e663055c1000e051f9aeaf324e3d85dce2 100644 (file)
--- 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))