summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-26 16:56:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-26 16:56:51 (GMT)
commitfe975a234fec6fa9c88b1d90d97542398267a484 (patch)
tree01be79ca7375ecf8a69670fce02581f5ac4f63ce /Lib/test
parentf2ad173eaf38140bd72a849f47e0427b3d941692 (diff)
parent94cb7a24298ee0a4d6a3bb6b8ae80a7729e9f788 (diff)
downloadcpython-fe975a234fec6fa9c88b1d90d97542398267a484.zip
cpython-fe975a234fec6fa9c88b1d90d97542398267a484.tar.gz
cpython-fe975a234fec6fa9c88b1d90d97542398267a484.tar.bz2
merge 3.4 (#23112)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_httpservers.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 97713cd..a31db5b 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -305,6 +305,12 @@ class SimpleHTTPServerTestCase(BaseTestCase):
self.check_status_and_reason(response, 200)
response = self.request(self.tempdir_name)
self.check_status_and_reason(response, 301)
+ response = self.request(self.tempdir_name + '/?hi=2')
+ self.check_status_and_reason(response, 200)
+ response = self.request(self.tempdir_name + '?hi=1')
+ self.check_status_and_reason(response, 301)
+ self.assertEqual(response.getheader("Location"),
+ self.tempdir_name + "/?hi=1")
response = self.request('/ThisDoesNotExist')
self.check_status_and_reason(response, 404)
response = self.request('/' + 'ThisDoesNotExist' + '/')