From: kevan <kevan@isnotajoke.com>
Date: Mon, 20 Jul 2009 03:46:32 +0000 (-0700)
Subject: Add tests for new PUT behavior
X-Git-Tag: allmydata-tahoe-1.5.0~28
X-Git-Url: https://git.rkrishnan.org/junkers?a=commitdiff_plain;h=40360a7a9c05b1fae44208d2a73ea8eb8104cb2f;p=tahoe-lafs%2Ftahoe-lafs.git

Add tests for new PUT behavior
---

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 23de764d..bc9005e0 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -702,6 +702,26 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
         d.addBoth(self.should404, "test_GET_FILEURL_missing")
         return d
 
+    def test_PUT_overwrite_only_files(self):
+        # create a directory, put a file in that directory.
+        contents, n, uri = self.makefile(8)
+        d = self.PUT(self.public_url + "/foo/dir?t=mkdir", "")
+        d.addCallback(lambda res:
+            self.PUT(self.public_url + "/foo/dir/file1.txt",
+                     self.NEWFILE_CONTENTS))
+        # try to overwrite the file with replace=only-files
+        # (this should work)
+        d.addCallback(lambda res:
+            self.PUT(self.public_url + "/foo/dir/file1.txt?t=uri&replace=only-files",
+                     uri))
+        d.addCallback(lambda res:
+            self.shouldFail2(error.Error, "PUT_bad_t", "409 Conflict",
+                 "There was already a child by that name, and you asked me "
+                 "to not replace it",
+                 self.PUT, self.public_url + "/foo/dir?t=uri&replace=only-files",
+                 uri))
+        return d
+
     def test_PUT_NEWFILEURL(self):
         d = self.PUT(self.public_url + "/foo/new.txt", self.NEWFILE_CONTENTS)
         # TODO: we lose the response code, so we can't check this