webish.py: test that _get_or_create_directories fix I made a few hours ago

This commit is contained in:
Brian Warner 2007-07-13 22:19:16 -07:00
parent 016e17446a
commit 6e1ad64c9d
2 changed files with 4 additions and 3 deletions

View File

@ -700,11 +700,11 @@ class Web(unittest.TestCase):
self.touch(localdir, "three/bar.txt")
self.touch(localdir, "zap.zip")
d = self.PUT("/vdrive/global/foo/newdir?t=upload&localdir=%s"
d = self.PUT("/vdrive/global/newdir?t=upload&localdir=%s"
% localdir, "")
def _check(res):
self.failUnless("newdir" in self._foo_node.children)
newnode = self.nodes[self._foo_node.children["newdir"]]
self.failUnless("newdir" in self.public_root.children)
newnode = self.nodes[self.public_root.children["newdir"]]
self.failUnlessEqual(sorted(newnode.children.keys()),
sorted(["one", "two", "three", "zap.zip"]))
onenode = self.nodes[newnode.children["one"]]

View File

@ -602,6 +602,7 @@ class PUTHandler(rend.Page):
if localfile:
d.addCallback(self._upload_localfile, localfile, name)
elif localdir:
# take the last step
d.addCallback(self._get_or_create_directories, self._path[-1:])
d.addCallback(self._upload_localdir, localdir)
else: