From: Brian Warner <warner@lothar.com>
Date: Tue, 25 Dec 2007 00:46:52 +0000 (-0700)
Subject: test_web.py: use /uri?t=mkdir instead of /uri/?t=mkdir, and confirm that the redirect... 
X-Git-Tag: allmydata-tahoe-0.7.0~73
X-Git-Url: https://git.rkrishnan.org/class-simplejson.JSONDecoder-index.html?a=commitdiff_plain;h=ae760b3ee46806ac61b3da3a391447a2534a728a;p=tahoe-lafs%2Ftahoe-lafs.git

test_web.py: use /uri?t=mkdir instead of /uri/?t=mkdir, and confirm that the redirection target is correct
---

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 8cf6e648..fb1d119a 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -1103,15 +1103,19 @@ class Web(WebMixin, unittest.TestCase):
         return d
 
     def test_POST_mkdir_no_parentdir_noredirect(self):
-        d = self.POST("/uri/?t=mkdir")
+        d = self.POST("/uri?t=mkdir")
         def _after_mkdir(res):
             self.failUnless(uri.is_string_newdirnode_rw(res))
         d.addCallback(_after_mkdir)
         return d
 
     def test_POST_mkdir_no_parentdir_redirect(self):
-        d = self.POST("/uri/?t=mkdir&redirect_to_result=true")
+        d = self.POST("/uri?t=mkdir&redirect_to_result=true")
         d.addBoth(self.shouldRedirect, None, statuscode='303')
+        def _check_target(target):
+            target = urllib.unquote(target)
+            self.failUnless(target.startswith("uri/URI:DIR2:"), target)
+        d.addCallback(_check_target)
         return d
 
     def test_welcome_page_mkdir_button(self):
@@ -1340,6 +1344,7 @@ class Web(WebMixin, unittest.TestCase):
             # properly, so we can't check for it.
             realtarget = self.webish_url + target
             self.failUnlessEqual(res.value.location, realtarget)
+        return res.value.location
 
     def test_GET_URI_form(self):
         base = "/uri?uri=%s" % self._bar_txt_uri