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

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

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index f03313f763c6d8690f11fdac39af7a5d8f271ec1..109ebdc4b8147a31e8952aac3e7ab5d62dc68760 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -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")