Changeset a5aebf0 in trunk

Timestamp:

2008-10-29T04:54:46Z (17 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

0350994

Parents:

e1d9169

Message:

web: test (and fix) PUT DIRURL t=uri, which replaces a directory in-place with some other cap

Location:

src/allmydata

Files:

• test/test_web.py (modified) (1 diff)
• web/directory.py (modified) (1 diff)

src/allmydata/test/test_web.py ¶

@@ -2163 +2163 @@
         return d
 
+    def test_PUT_DIRURL_uri(self):
+        d = self.s.create_empty_dirnode()
+        def _made_dir(dn):
+            new_uri = dn.get_uri()
+            # replace /foo with a new (empty) directory
+            d = self.PUT(self.public_url + "/foo?t=uri", new_uri)
+            d.addCallback(lambda res:
+                          self.failUnlessEqual(res.strip(), new_uri))
+            d.addCallback(lambda res:
+                          self.failUnlessChildURIIs(self.public_root,
+                                                    u"foo",
+                                                    new_uri))
+            return d
+        d.addCallback(_made_dir)
+        return d
+
     def test_PUT_NEWFILEURL_uri(self):
         contents, n, new_uri = self.makefile(8)

src/allmydata/web/directory.py ¶

@@ -160 +160 @@
                 # (by us).
                 raise ExistingChildError()
-            d = self.parentnode.replace_me_with_a_childcap(ctx, replace)
+            d = self.replace_me_with_a_childcap(ctx, replace)
             # TODO: results
             return d