ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
david-sarah 2011-08-10 13:29:42 -07:00
parent c55c44e70a
commit dd23f265bf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/test/test_dirnode.py
View File

@ -593,7 +593,6 @@ class Dirnode(GridTestMixin, unittest.TestCase,
u"empty_litdir": (nm.create_from_cap(empty_litdir_uri), {}), u"empty_litdir": (nm.create_from_cap(empty_litdir_uri), {}),
u"tiny_litdir": (nm.create_from_cap(tiny_litdir_uri), {}), u"tiny_litdir": (nm.create_from_cap(tiny_litdir_uri), {}),
} }
d = None
if mdmf: if mdmf:
d = c.create_dirnode(kids, version=MDMF_VERSION) d = c.create_dirnode(kids, version=MDMF_VERSION)
else: else:
@ -616,6 +615,7 @@ class Dirnode(GridTestMixin, unittest.TestCase,
rep = str(dn) rep = str(dn)
self.failUnless("RW-MUT" in rep) self.failUnless("RW-MUT" in rep)
return dn.list() return dn.list()
d.addCallback(_created)
def _check_kids(children): def _check_kids(children):
self.failUnlessReallyEqual(set(children.keys()), 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 children: children[u"short"][0].read(MemAccum()))
d2.addCallback(lambda accum: self.failUnlessReallyEqual(accum.data, "The end.")) d2.addCallback(lambda accum: self.failUnlessReallyEqual(accum.data, "The end."))
return d2 return d2
d.addCallback(_created)
d.addCallback(_check_kids) d.addCallback(_check_kids)
d.addCallback(lambda ign: nm.create_new_mutable_directory(kids)) d.addCallback(lambda ign: nm.create_new_mutable_directory(kids))