Changeset 2cb0581 in trunk

Timestamp:

2007-12-12T02:47:04Z (17 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

38d1af7

Parents:

b085097

Message:

test_web.py: survive localdir/localfile= names with spaces. Should close #223

File:

• src/allmydata/test/test_web.py (modified) (17 diffs)

src/allmydata/test/test_web.py ¶

@@ -445 +445 @@
 
     def test_GET_FILEURL_localfile(self):
-        localfile = os.path.abspath("web/GET_FILEURL_localfile")
-        url = self.public_url + "/foo/bar.txt?t=download&localfile=%s" % localfile
+        localfile = os.path.abspath("web/GET_FILEURL_local file")
+        url = (self.public_url + "/foo/bar.txt?t=download&localfile=%s" %
+               urllib.quote(localfile))
         fileutil.make_dirs("web")
         d = self.GET(url)
@@ -457 +458 @@
 
     def test_GET_FILEURL_localfile_disabled(self):
-        localfile = os.path.abspath("web/GET_FILEURL_localfile_disabled")
-        url = self.public_url + "/foo/bar.txt?t=download&localfile=%s" % localfile
+        localfile = os.path.abspath("web/GET_FILEURL_local file_disabled")
+        url = (self.public_url + "/foo/bar.txt?t=download&localfile=%s" %
+               urllib.quote(localfile))
         fileutil.make_dirs("web")
         self.disable_local_access()
@@ -473 +475 @@
         old_LOCALHOST = webish.LOCALHOST
         webish.LOCALHOST = "127.0.0.2"
-        localfile = os.path.abspath("web/GET_FILEURL_localfile_nonlocal")
+        localfile = os.path.abspath("web/GET_FILEURL_local file_nonlocal")
         fileutil.make_dirs("web")
         d = self.GET(self.public_url + "/foo/bar.txt?t=download&localfile=%s"
-                     % localfile)
+                     % urllib.quote(localfile))
         d.addBoth(self.shouldFail, error.Error, "localfile non-local",
                   "403 Forbidden",
@@ -493 +495 @@
         fileutil.make_dirs("web/nonabsolute")
         d = self.GET(self.public_url + "/foo/bar.txt?t=download&localfile=%s"
-                     % localfile)
+                     % urllib.quote(localfile))
         d.addBoth(self.shouldFail, error.Error, "localfile non-absolute",
                   "403 Forbidden",
@@ -503 +505 @@
 
     def test_PUT_NEWFILEURL_localfile(self):
-        localfile = os.path.abspath("web/PUT_NEWFILEURL_localfile")
-        url = self.public_url + "/foo/new.txt?t=upload&localfile=%s" % localfile
+        localfile = os.path.abspath("web/PUT_NEWFILEURL_local file")
+        url = (self.public_url + "/foo/new.txt?t=upload&localfile=%s" %
+               urllib.quote(localfile))
         fileutil.make_dirs("web")
         f = open(localfile, "wb")
@@ -517 +520 @@
 
     def test_PUT_NEWFILEURL_localfile_disabled(self):
-        localfile = os.path.abspath("web/PUT_NEWFILEURL_localfile_disabled")
-        url = self.public_url + "/foo/new.txt?t=upload&localfile=%s" % localfile
+        localfile = os.path.abspath("web/PUT_NEWFILEURL_local file_disabled")
+        url = (self.public_url + "/foo/new.txt?t=upload&localfile=%s" %
+               urllib.quote(localfile))
         fileutil.make_dirs("web")
         f = open(localfile, "wb")
@@ -531 +535 @@
 
     def test_PUT_NEWFILEURL_localfile_mkdirs(self):
-        localfile = os.path.abspath("web/PUT_NEWFILEURL_localfile_mkdirs")
+        localfile = os.path.abspath("web/PUT_NEWFILEURL_local file_mkdirs")
         fileutil.make_dirs("web")
         f = open(localfile, "wb")
@@ -537 +541 @@
         f.close()
         d = self.PUT(self.public_url + "/foo/newdir/new.txt?t=upload&localfile=%s"
-                     % localfile, "")
+                     % urllib.quote(localfile), "")
         d.addCallback(self.failUnlessURIMatchesChild,
                       self._foo_node, "newdir/new.txt")
@@ -715 +719 @@
 
     def test_GET_DIRURL_localdir(self):
-        localdir = os.path.abspath("web/GET_DIRURL_localdir")
+        localdir = os.path.abspath("web/GET_DIRURL_local dir")
         fileutil.make_dirs("web")
-        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" % localdir)
+        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" %
+                     urllib.quote(localdir))
         def _check(res):
             barfile = os.path.join(localdir, "bar.txt")
@@ -731 +736 @@
 
     def test_GET_DIRURL_localdir_disabled(self):
-        localdir = os.path.abspath("web/GET_DIRURL_localdir_disabled")
+        localdir = os.path.abspath("web/GET_DIRURL_local dir_disabled")
         fileutil.make_dirs("web")
         self.disable_local_access()
-        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" % localdir)
+        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" %
+                     urllib.quote(localdir))
         d.addBoth(self.shouldFail, error.Error, "localfile disabled",
                   "403 Forbidden",
@@ -741 +747 @@
 
     def test_GET_DIRURL_localdir_nonabsolute(self):
-        localdir = "web/nonabsolute/dirpath"
+        localdir = "web/nonabsolute/dir path"
         fileutil.make_dirs("web/nonabsolute")
-        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" % localdir)
+        d = self.GET(self.public_url + "/foo?t=download&localdir=%s" %
+                     urllib.quote(localdir))
         d.addBoth(self.shouldFail, error.Error, "localdir non-absolute",
                   "403 Forbidden",
@@ -811 +818 @@
 
     def test_PUT_NEWDIRURL_localdir(self):
-        localdir = os.path.abspath("web/PUT_NEWDIRURL_localdir")
+        localdir = os.path.abspath("web/PUT_NEWDIRURL_local dir")
         # create some files there
         fileutil.make_dirs(os.path.join(localdir, "one"))
@@ -822 +829 @@
 
         d = self.PUT(self.public_url + "/newdir?t=upload&localdir=%s"
-                     % localdir, "")
+                     % urllib.quote(localdir), "")
         pr = self.public_root
         d.addCallback(lambda res: self.failUnlessNodeHasChild(pr, "newdir"))
@@ -840 +847 @@
 
     def test_PUT_NEWDIRURL_localdir_disabled(self):
-        localdir = os.path.abspath("web/PUT_NEWDIRURL_localdir_disabled")
+        localdir = os.path.abspath("web/PUT_NEWDIRURL_local dir_disabled")
         # create some files there
         fileutil.make_dirs(os.path.join(localdir, "one"))
@@ -852 +859 @@
         self.disable_local_access()
         d = self.PUT(self.public_url + "/newdir?t=upload&localdir=%s"
-                     % localdir, "")
+                     % urllib.quote(localdir), "")
         d.addBoth(self.shouldFail, error.Error, "localfile disabled",
                   "403 Forbidden",
@@ -859 +866 @@
 
     def test_PUT_NEWDIRURL_localdir_mkdirs(self):
-        localdir = os.path.abspath("web/PUT_NEWDIRURL_localdir_mkdirs")
+        localdir = os.path.abspath("web/PUT_NEWDIRURL_local dir_mkdirs")
         # create some files there
         fileutil.make_dirs(os.path.join(localdir, "one"))
@@ -870 +877 @@
 
         d = self.PUT(self.public_url + "/foo/subdir/newdir?t=upload&localdir=%s"
-                     % localdir,
+                     % urllib.quote(localdir),
                      "")
         fn = self._foo_node