ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge some minor conflicts in test code from the 393-2 branch and trunk

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2011-08-10 10:21:39 -07:00
parent 43ba172f65
commit 95a7551586
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
import time
import unicodedata
from zope.interface import implements
@ -594,8 +593,12 @@ 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 = c.create_dirnode(kids)
d = None
if mdmf:
d = c.create_dirnode(kids, version=MDMF_VERSION)
else:
d = c.create_dirnode(kids)
def _created(dn):
self.failUnless(isinstance(dn, dirnode.DirectoryNode))
backing_node = dn._node
@ -613,8 +616,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()),
set([one_nfc, u"two", u"mut", u"fut", u"fro",

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

@ -1,4 +1,3 @@
import os.path, re, urllib, time
import simplejson
from StringIO import StringIO
@ -1370,7 +1369,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self.failUnless(CSS_STYLE.search(res), res)
d.addCallback(_check)
return d
def test_GET_FILEURL_uri_missing(self):
d = self.GET(self.public_url + "/foo/missing?t=uri")
d.addBoth(self.should404, "test_GET_FILEURL_uri_missing")