dirnode.set_nodes: change return value: fire with self instead of None

diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index 8dc9139c17fd03f1776f2c55446a894d27e119a3..4a2e751f5fd221a750734599511fbd124f27dc7c 100644 (file)
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -443,7 +443,7 @@ class DirectoryNode:
             return defer.fail(NotMutableError())
         a = Adder(self, entries, overwrite=overwrite)
         d = self._node.modify(a.modify)
-        d.addCallback(lambda res: None)
+        d.addCallback(lambda res: self)
         return d
 
 

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index d2a93e3e37fbc318e324983e8ebf41e7f8b1b56c..f07788f5f6cc7e1be0836b4c5075b4e60a77e7b9 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -926,8 +926,8 @@ class IDirectoryNode(IMutableFilesystemNode):
     def set_nodes(entries, overwrite=True):
         """Add multiple (name, child_node) pairs (or (name, child_node,
         metadata) triples) to a directory node. Returns a Deferred that fires
-        (with None) when the operation finishes. This is equivalent to
-        calling set_node() multiple times, but is much more efficient. All
+        (with this dirnode) when the operation finishes. This is equivalent
+        to calling set_node() multiple times, but is much more efficient. All
         child names must be unicode strings."""
 
 

diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py
index b4c2f76025c15dbaef7eaf188374d4e88acde2de..c68411702112adf921c8179659afdd5e54a5431a 100644 (file)
--- a/src/allmydata/test/test_dirnode.py
+++ b/src/allmydata/test/test_dirnode.py
@@ -490,6 +490,7 @@ class Dirnode(GridTestMixin, unittest.TestCase,
                                                     (u"f3", n,
                                                      {"key": "value"}),
                                                     ]))
+            d.addCallback(lambda n2: self.failUnlessIdentical(n2, n))
             d.addCallback(lambda res:
                           self.shouldFail(ExistingChildError, "set_nodes-no",
                                           "child 'f1' already exists",