Mercurial > cpython-lru_cache-weakref
annotate Lib/test/test_httpservers.py @ 68776:fa20590d4694 3.2
Try to strengthen test_httpservers (issue #11617)
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Mon, 21 Mar 2011 00:26:51 +0100 |
| parents | dc245d681901 |
| children | 4dc5590dbd0b 25298224cb25 |
| rev | line source |
|---|---|
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
1 """Unittests for the various HTTPServer modules. |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
2 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
3 Written by Cody A.W. Somerville <cody-somerville@ubuntu.com>, |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
4 Josip Dzolonga, and Michael Otteneder for the 2007/08 GHOP contest. |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
5 """ |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
6 |
|
47318
e1fcc3881cb6
Create http package. #2883.
Georg Brandl <georg@python.org>
parents:
47278
diff
changeset
|
7 from http.server import BaseHTTPRequestHandler, HTTPServer, \ |
|
e1fcc3881cb6
Create http package. #2883.
Georg Brandl <georg@python.org>
parents:
47278
diff
changeset
|
8 SimpleHTTPRequestHandler, CGIHTTPRequestHandler |
|
53073
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
9 from http import server |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
10 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
11 import os |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
12 import sys |
|
65029
d787ef9acb72
Add BaseHTTPRequestHandler related tests.
Senthil Kumaran <orsenthil@gmail.com>
parents:
60972
diff
changeset
|
13 import re |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
14 import base64 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
15 import shutil |
|
48334
5a416a6417d3
Make a new urllib package .
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
47635
diff
changeset
|
16 import urllib.parse |
|
47318
e1fcc3881cb6
Create http package. #2883.
Georg Brandl <georg@python.org>
parents:
47278
diff
changeset
|
17 import http.client |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
18 import tempfile |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
19 from io import BytesIO |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
20 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
21 import unittest |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
22 from test import support |
|
61073
493bb4585e38
Merged revisions 80552-80556,80564-80566,80568-80571 via svnmerge from
Victor Stinner <victor.stinner@haypocalc.com>
parents:
60970
diff
changeset
|
23 threading = support.import_module('threading') |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
24 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
25 class NoLogRequestHandler: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
26 def log_message(self, *args): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
27 # don't write log messages to stderr |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
28 pass |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
29 |
|
47635
f31e32a2013c
Patch for issue 2848, mostly by Humberto Diogenes, with a couple of
Barry Warsaw <barry@python.org>
parents:
47318
diff
changeset
|
30 def read(self, n=None): |
|
f31e32a2013c
Patch for issue 2848, mostly by Humberto Diogenes, with a couple of
Barry Warsaw <barry@python.org>
parents:
47318
diff
changeset
|
31 return '' |
|
f31e32a2013c
Patch for issue 2848, mostly by Humberto Diogenes, with a couple of
Barry Warsaw <barry@python.org>
parents:
47318
diff
changeset
|
32 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
33 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
34 class TestServerThread(threading.Thread): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
35 def __init__(self, test_object, request_handler): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
36 threading.Thread.__init__(self) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
37 self.request_handler = request_handler |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
38 self.test_object = test_object |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
39 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
40 def run(self): |
|
68776
fa20590d4694
Try to strengthen test_httpservers (issue #11617)
Antoine Pitrou <solipsis@pitrou.net>
parents:
68586
diff
changeset
|
41 self.server = HTTPServer(('localhost', 0), self.request_handler) |
|
fa20590d4694
Try to strengthen test_httpservers (issue #11617)
Antoine Pitrou <solipsis@pitrou.net>
parents:
68586
diff
changeset
|
42 self.test_object.HOST, self.test_object.PORT = self.server.socket.getsockname() |
|
60972
9165232e6d1a
Merged revisions 80487,80489 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60063
diff
changeset
|
43 self.test_object.server_started.set() |
|
9165232e6d1a
Merged revisions 80487,80489 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60063
diff
changeset
|
44 self.test_object = None |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
45 try: |
|
60972
9165232e6d1a
Merged revisions 80487,80489 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60063
diff
changeset
|
46 self.server.serve_forever(0.05) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
47 finally: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
48 self.server.server_close() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
49 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
50 def stop(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
51 self.server.shutdown() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
52 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
53 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
54 class BaseTestCase(unittest.TestCase): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
55 def setUp(self): |
|
56871
8fb8fd3b67cf
Merged revisions 75838 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
56592
diff
changeset
|
56 self._threads = support.threading_setup() |
|
56592
098ba3a63730
Note that a number of the changes listed below were not applicable to the Py3k branch, and hence the corresponding
Nick Coghlan <ncoghlan@gmail.com>
parents:
55593
diff
changeset
|
57 os.environ = support.EnvironmentVarGuard() |
|
60972
9165232e6d1a
Merged revisions 80487,80489 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60063
diff
changeset
|
58 self.server_started = threading.Event() |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
59 self.thread = TestServerThread(self, self.request_handler) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
60 self.thread.start() |
|
60972
9165232e6d1a
Merged revisions 80487,80489 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
60063
diff
changeset
|
61 self.server_started.wait() |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
62 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
63 def tearDown(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
64 self.thread.stop() |
|
56592
098ba3a63730
Note that a number of the changes listed below were not applicable to the Py3k branch, and hence the corresponding
Nick Coghlan <ncoghlan@gmail.com>
parents:
55593
diff
changeset
|
65 os.environ.__exit__() |
|
56871
8fb8fd3b67cf
Merged revisions 75838 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
56592
diff
changeset
|
66 support.threading_cleanup(*self._threads) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
67 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
68 def request(self, uri, method='GET', body=None, headers={}): |
|
68776
fa20590d4694
Try to strengthen test_httpservers (issue #11617)
Antoine Pitrou <solipsis@pitrou.net>
parents:
68586
diff
changeset
|
69 self.connection = http.client.HTTPConnection(self.HOST, self.PORT) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
70 self.connection.request(method, uri, body, headers) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
71 return self.connection.getresponse() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
72 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
73 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
74 class BaseHTTPServerTestCase(BaseTestCase): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
75 class request_handler(NoLogRequestHandler, BaseHTTPRequestHandler): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
76 protocol_version = 'HTTP/1.1' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
77 default_request_version = 'HTTP/1.1' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
78 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
79 def do_TEST(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
80 self.send_response(204) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
81 self.send_header('Content-Type', 'text/html') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
82 self.send_header('Connection', 'close') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
83 self.end_headers() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
84 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
85 def do_KEEP(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
86 self.send_response(204) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
87 self.send_header('Content-Type', 'text/html') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
88 self.send_header('Connection', 'keep-alive') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
89 self.end_headers() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
90 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
91 def do_KEYERROR(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
92 self.send_error(999) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
93 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
94 def do_CUSTOM(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
95 self.send_response(999) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
96 self.send_header('Content-Type', 'text/html') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
97 self.send_header('Connection', 'close') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
98 self.end_headers() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
99 |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
100 def do_LATINONEHEADER(self): |
|
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
101 self.send_response(999) |
|
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
102 self.send_header('X-Special', 'Dängerous Mind') |
|
67720
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
103 self.send_header('Connection', 'close') |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
104 self.end_headers() |
|
67720
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
105 body = self.headers['x-special-incoming'].encode('utf-8') |
|
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
106 self.wfile.write(body) |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
107 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
108 def setUp(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
109 BaseTestCase.setUp(self) |
|
68776
fa20590d4694
Try to strengthen test_httpservers (issue #11617)
Antoine Pitrou <solipsis@pitrou.net>
parents:
68586
diff
changeset
|
110 self.con = http.client.HTTPConnection(self.HOST, self.PORT) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
111 self.con.connect() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
112 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
113 def test_command(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
114 self.con.request('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
115 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
116 self.assertEqual(res.status, 501) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
117 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
118 def test_request_line_trimming(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
119 self.con._http_vsn_str = 'HTTP/1.1\n' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
120 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
121 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
122 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
123 self.assertEqual(res.status, 501) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
124 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
125 def test_version_bogus(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
126 self.con._http_vsn_str = 'FUBAR' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
127 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
128 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
129 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
130 self.assertEqual(res.status, 400) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
131 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
132 def test_version_digits(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
133 self.con._http_vsn_str = 'HTTP/9.9.9' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
134 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
135 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
136 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
137 self.assertEqual(res.status, 400) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
138 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
139 def test_version_none_get(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
140 self.con._http_vsn_str = '' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
141 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
142 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
143 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
144 self.assertEqual(res.status, 501) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
145 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
146 def test_version_none(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
147 self.con._http_vsn_str = '' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
148 self.con.putrequest('PUT', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
149 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
150 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
151 self.assertEqual(res.status, 400) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
152 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
153 def test_version_invalid(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
154 self.con._http_vsn = 99 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
155 self.con._http_vsn_str = 'HTTP/9.9' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
156 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
157 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
158 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
159 self.assertEqual(res.status, 505) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
160 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
161 def test_send_blank(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
162 self.con._http_vsn_str = '' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
163 self.con.putrequest('', '') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
164 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
165 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
166 self.assertEqual(res.status, 400) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
167 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
168 def test_header_close(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
169 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
170 self.con.putheader('Connection', 'close') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
171 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
172 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
173 self.assertEqual(res.status, 501) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
174 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
175 def test_head_keep_alive(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
176 self.con._http_vsn_str = 'HTTP/1.1' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
177 self.con.putrequest('GET', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
178 self.con.putheader('Connection', 'keep-alive') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
179 self.con.endheaders() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
180 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
181 self.assertEqual(res.status, 501) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
182 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
183 def test_handler(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
184 self.con.request('TEST', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
185 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
186 self.assertEqual(res.status, 204) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
187 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
188 def test_return_header_keep_alive(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
189 self.con.request('KEEP', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
190 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
191 self.assertEqual(res.getheader('Connection'), 'keep-alive') |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
192 self.con.request('TEST', '/') |
|
65788
211858723b8c
Fix ResourceWarning for an unclosed socket.
Brian Curtin <brian.curtin@gmail.com>
parents:
65740
diff
changeset
|
193 self.addCleanup(self.con.close) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
194 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
195 def test_internal_key_error(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
196 self.con.request('KEYERROR', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
197 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
198 self.assertEqual(res.status, 999) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
199 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
200 def test_return_custom_status(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
201 self.con.request('CUSTOM', '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
202 res = self.con.getresponse() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
203 self.assertEqual(res.status, 999) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
204 |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
205 def test_latin1_header(self): |
|
67720
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
206 self.con.request('LATINONEHEADER', '/', headers={ |
|
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
207 'X-Special-Incoming': 'Ärger mit Unicode' |
|
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
208 }) |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
209 res = self.con.getresponse() |
|
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
210 self.assertEqual(res.getheader('X-Special'), 'Dängerous Mind') |
|
67720
b3cadf5cf742
To match the behaviour of HTTP server, the HTTP client library now also encodes
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67719
diff
changeset
|
211 self.assertEqual(res.read(), 'Ärger mit Unicode'.encode('utf-8')) |
|
67719
30c91342b6ae
Issue #10980: encode headers with latin1 instead of ASCII in the HTTP server.
Armin Ronacher <armin.ronacher@active-4.com>
parents:
67183
diff
changeset
|
212 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
213 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
214 class SimpleHTTPServerTestCase(BaseTestCase): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
215 class request_handler(NoLogRequestHandler, SimpleHTTPRequestHandler): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
216 pass |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
217 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
218 def setUp(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
219 BaseTestCase.setUp(self) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
220 self.cwd = os.getcwd() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
221 basetempdir = tempfile.gettempdir() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
222 os.chdir(basetempdir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
223 self.data = b'We are the knights who say Ni!' |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
224 self.tempdir = tempfile.mkdtemp(dir=basetempdir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
225 self.tempdir_name = os.path.basename(self.tempdir) |
|
65740
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
226 with open(os.path.join(self.tempdir, 'test'), 'wb') as temp: |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
227 temp.write(self.data) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
228 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
229 def tearDown(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
230 try: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
231 os.chdir(self.cwd) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
232 try: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
233 shutil.rmtree(self.tempdir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
234 except: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
235 pass |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
236 finally: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
237 BaseTestCase.tearDown(self) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
238 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
239 def check_status_and_reason(self, response, status, data=None): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
240 body = response.read() |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
53073
diff
changeset
|
241 self.assertTrue(response) |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
242 self.assertEqual(response.status, status) |
|
59728
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
243 self.assertIsNotNone(response.reason) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
244 if data: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
245 self.assertEqual(data, body) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
246 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
247 def test_get(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
248 #constructs the path relative to the root directory of the HTTPServer |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
249 response = self.request(self.tempdir_name + '/test') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
250 self.check_status_and_reason(response, 200, data=self.data) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
251 response = self.request(self.tempdir_name + '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
252 self.check_status_and_reason(response, 200) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
253 response = self.request(self.tempdir_name) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
254 self.check_status_and_reason(response, 301) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
255 response = self.request('/ThisDoesNotExist') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
256 self.check_status_and_reason(response, 404) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
257 response = self.request('/' + 'ThisDoesNotExist' + '/') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
258 self.check_status_and_reason(response, 404) |
|
65740
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
259 with open(os.path.join(self.tempdir_name, 'index.html'), 'w') as f: |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
260 response = self.request('/' + self.tempdir_name + '/') |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
261 self.check_status_and_reason(response, 200) |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
262 if os.name == 'posix': |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
263 # chmod won't work as expected on Windows platforms |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
264 os.chmod(self.tempdir, 0) |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
265 response = self.request(self.tempdir_name + '/') |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
266 self.check_status_and_reason(response, 404) |
|
40ac45a092b7
Move test_httpservers over to file context managers.
Brett Cannon <bcannon@gmail.com>
parents:
65493
diff
changeset
|
267 os.chmod(self.tempdir, 0o755) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
268 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
269 def test_head(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
270 response = self.request( |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
271 self.tempdir_name + '/test', method='HEAD') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
272 self.check_status_and_reason(response, 200) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
273 self.assertEqual(response.getheader('content-length'), |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
274 str(len(self.data))) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
275 self.assertEqual(response.getheader('content-type'), |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
276 'application/octet-stream') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
277 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
278 def test_invalid_requests(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
279 response = self.request('/', method='FOO') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
280 self.check_status_and_reason(response, 501) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
281 # requests must be case sensitive,so this should fail too |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
282 response = self.request('/', method='get') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
283 self.check_status_and_reason(response, 501) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
284 response = self.request('/', method='GETs') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
285 self.check_status_and_reason(response, 501) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
286 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
287 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
288 cgi_file1 = """\ |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
289 #!%s |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
290 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
291 print("Content-type: text/html") |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
292 print() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
293 print("Hello World") |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
294 """ |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
295 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
296 cgi_file2 = """\ |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
297 #!%s |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
298 import cgi |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
299 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
300 print("Content-type: text/html") |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
301 print() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
302 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
303 form = cgi.FieldStorage() |
|
59728
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
304 print("%%s, %%s, %%s" %% (form.getfirst("spam"), form.getfirst("eggs"), |
|
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
305 form.getfirst("bacon"))) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
306 """ |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
307 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
308 class CGIHTTPServerTestCase(BaseTestCase): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
309 class request_handler(NoLogRequestHandler, CGIHTTPRequestHandler): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
310 pass |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
311 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
312 def setUp(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
313 BaseTestCase.setUp(self) |
|
65489
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
314 self.cwd = os.getcwd() |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
315 self.parent_dir = tempfile.mkdtemp() |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
316 self.cgi_dir = os.path.join(self.parent_dir, 'cgi-bin') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
317 os.mkdir(self.cgi_dir) |
|
65489
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
318 self.file1_path = None |
|
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
319 self.file2_path = None |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
320 |
|
60063
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
321 # The shebang line should be pure ASCII: use symlink if possible. |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
322 # See issue #7668. |
|
67183
5aa433a277f9
Fix #9333. The symlink function is always available now, raising OSError
Brian Curtin <brian.curtin@gmail.com>
parents:
67020
diff
changeset
|
323 if support.can_symlink(): |
|
60063
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
324 self.pythonexe = os.path.join(self.parent_dir, 'python') |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
325 os.symlink(sys.executable, self.pythonexe) |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
326 else: |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
327 self.pythonexe = sys.executable |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
328 |
|
65492
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
329 try: |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
330 # The python executable path is written as the first line of the |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
331 # CGI Python script. The encoding cookie cannot be used, and so the |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
332 # path should be encodable to the default script encoding (utf-8) |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
333 self.pythonexe.encode('utf-8') |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
334 except UnicodeEncodeError: |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
335 self.tearDown() |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
336 raise self.skipTest( |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
337 "Python executable path is not encodable to utf-8") |
|
b2a9ca2b61a2
test_httpservers: Fix skip test check, the python executable path have to be
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65489
diff
changeset
|
338 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
339 self.file1_path = os.path.join(self.cgi_dir, 'file1.py') |
|
65493
c147f910af70
test_httpservers: Python CGI scripts have to be encoded to utf-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65492
diff
changeset
|
340 with open(self.file1_path, 'w', encoding='utf-8') as file1: |
|
60063
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
341 file1.write(cgi_file1 % self.pythonexe) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
342 os.chmod(self.file1_path, 0o777) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
343 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
344 self.file2_path = os.path.join(self.cgi_dir, 'file2.py') |
|
65493
c147f910af70
test_httpservers: Python CGI scripts have to be encoded to utf-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65492
diff
changeset
|
345 with open(self.file2_path, 'w', encoding='utf-8') as file2: |
|
60063
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
346 file2.write(cgi_file2 % self.pythonexe) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
347 os.chmod(self.file2_path, 0o777) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
348 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
349 os.chdir(self.parent_dir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
350 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
351 def tearDown(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
352 try: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
353 os.chdir(self.cwd) |
|
60063
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
354 if self.pythonexe != sys.executable: |
|
e63d4678fca7
Note: only the relevant parts of r79474 are merged.
Florent Xicluna <florent.xicluna@gmail.com>
parents:
55593
diff
changeset
|
355 os.remove(self.pythonexe) |
|
65489
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
356 if self.file1_path: |
|
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
357 os.remove(self.file1_path) |
|
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
358 if self.file2_path: |
|
b0228af6db11
test_httpservers: skip CGI tests if Python executable path is not encodable
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65075
diff
changeset
|
359 os.remove(self.file2_path) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
360 os.rmdir(self.cgi_dir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
361 os.rmdir(self.parent_dir) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
362 finally: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
363 BaseTestCase.tearDown(self) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
364 |
|
53073
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
365 def test_url_collapse_path_split(self): |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
366 test_vectors = { |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
367 '': ('/', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
368 '..': IndexError, |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
369 '/.//..': IndexError, |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
370 '/': ('/', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
371 '//': ('/', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
372 '/\\': ('/', '\\'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
373 '/.//': ('/', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
374 'cgi-bin/file1.py': ('/cgi-bin', 'file1.py'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
375 '/cgi-bin/file1.py': ('/cgi-bin', 'file1.py'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
376 'a': ('/', 'a'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
377 '/a': ('/', 'a'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
378 '//a': ('/', 'a'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
379 './a': ('/', 'a'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
380 './C:/': ('/C:', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
381 '/a/b': ('/a', 'b'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
382 '/a/b/': ('/a/b', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
383 '/a/b/c/..': ('/a/b', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
384 '/a/b/c/../d': ('/a/b', 'd'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
385 '/a/b/c/../d/e/../f': ('/a/b/d', 'f'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
386 '/a/b/c/../d/e/../../f': ('/a/b', 'f'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
387 '/a/b/c/../d/e/.././././..//f': ('/a/b', 'f'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
388 '../a/b/c/../d/e/.././././..//f': IndexError, |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
389 '/a/b/c/../d/e/../../../f': ('/a', 'f'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
390 '/a/b/c/../d/e/../../../../f': ('/', 'f'), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
391 '/a/b/c/../d/e/../../../../../f': IndexError, |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
392 '/a/b/c/../d/e/../../../../f/..': ('/', ''), |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
393 } |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
394 for path, expected in test_vectors.items(): |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
395 if isinstance(expected, type) and issubclass(expected, Exception): |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
396 self.assertRaises(expected, |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
397 server._url_collapse_path_split, path) |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
398 else: |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
399 actual = server._url_collapse_path_split(path) |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
400 self.assertEqual(expected, actual, |
|
59728
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
401 msg='path = %r\nGot: %r\nWanted: %r' % |
|
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
402 (path, actual, expected)) |
|
53073
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
403 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
404 def test_headers_and_content(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
405 res = self.request('/cgi-bin/file1.py') |
|
59728
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
406 self.assertEqual((b'Hello World\n', 'text/html', 200), |
|
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
407 (res.read(), res.getheader('Content-type'), res.status)) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
408 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
409 def test_post(self): |
|
48334
5a416a6417d3
Make a new urllib package .
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
47635
diff
changeset
|
410 params = urllib.parse.urlencode( |
|
5a416a6417d3
Make a new urllib package .
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
47635
diff
changeset
|
411 {'spam' : 1, 'eggs' : 'python', 'bacon' : 123456}) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
412 headers = {'Content-type' : 'application/x-www-form-urlencoded'} |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
413 res = self.request('/cgi-bin/file2.py', 'POST', params, headers) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
414 |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
415 self.assertEqual(res.read(), b'1, python, 123456\n') |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
416 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
417 def test_invaliduri(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
418 res = self.request('/cgi-bin/invalid') |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
419 res.read() |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
420 self.assertEqual(res.status, 404) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
421 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
422 def test_authorization(self): |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
423 headers = {b'Authorization' : b'Basic ' + |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
424 base64.b64encode(b'username:pass')} |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
425 res = self.request('/cgi-bin/file1.py', 'GET', headers=headers) |
|
59728
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
426 self.assertEqual((b'Hello World\n', 'text/html', 200), |
|
4587e1f74ed8
Merged revisions 79100 via svnmerge from
Florent Xicluna <florent.xicluna@gmail.com>
parents:
56871
diff
changeset
|
427 (res.read(), res.getheader('Content-type'), res.status)) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
428 |
|
53073
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
429 def test_no_leading_slash(self): |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
430 # http://bugs.python.org/issue2254 |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
431 res = self.request('cgi-bin/file1.py') |
|
66340
2beb25369289
Merged revisions 86596 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
65076
diff
changeset
|
432 self.assertEqual((b'Hello World\n', 'text/html', 200), |
|
53073
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
433 (res.read(), res.getheader('Content-type'), res.status)) |
|
3b1b6142690a
Merged revisions 71303 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
48334
diff
changeset
|
434 |
|
65076
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
435 def test_os_environ_is_not_altered(self): |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
436 signature = "Test CGI Server" |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
437 os.environ['SERVER_SOFTWARE'] = signature |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
438 res = self.request('/cgi-bin/file1.py') |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
439 self.assertEqual((b'Hello World\n', 'text/html', 200), |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
440 (res.read(), res.getheader('Content-type'), res.status)) |
|
945a55d4e73e
Merged revisions 85202 via svnmerge from
Senthil Kumaran <orsenthil@gmail.com>
parents:
65029
diff
changeset
|
441 self.assertEqual(os.environ['SERVER_SOFTWARE'], signature) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
442 |
|
66971
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
443 |
|
63558
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
444 class SocketlessRequestHandler(SimpleHTTPRequestHandler): |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
445 def __init__(self): |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
446 self.get_called = False |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
447 self.protocol_version = "HTTP/1.1" |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
448 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
449 def do_GET(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
450 self.get_called = True |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
451 self.send_response(200) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
452 self.send_header('Content-Type', 'text/html') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
453 self.end_headers() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
454 self.wfile.write(b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
455 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
456 def log_message(self, format, *args): |
|
63558
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
457 pass |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
458 |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
459 class RejectingSocketlessRequestHandler(SocketlessRequestHandler): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
460 def handle_expect_100(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
461 self.send_error(417) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
462 return False |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
463 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
464 class BaseHTTPRequestHandlerTestCase(unittest.TestCase): |
| 68586 | 465 """Test the functionality of the BaseHTTPServer. |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
466 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
467 Test the support for the Expect 100-continue header. |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
468 """ |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
469 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
470 HTTPResponseMatch = re.compile(b'HTTP/1.[0-9]+ 200 OK') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
471 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
472 def setUp (self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
473 self.handler = SocketlessRequestHandler() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
474 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
475 def send_typical_request(self, message): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
476 input = BytesIO(message) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
477 output = BytesIO() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
478 self.handler.rfile = input |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
479 self.handler.wfile = output |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
480 self.handler.handle_one_request() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
481 output.seek(0) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
482 return output.readlines() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
483 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
484 def verify_get_called(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
485 self.assertTrue(self.handler.get_called) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
486 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
487 def verify_expected_headers(self, headers): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
488 for fieldName in b'Server: ', b'Date: ', b'Content-Type: ': |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
489 self.assertEqual(sum(h.startswith(fieldName) for h in headers), 1) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
490 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
491 def verify_http_server_response(self, response): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
492 match = self.HTTPResponseMatch.search(response) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
493 self.assertTrue(match is not None) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
494 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
495 def test_http_1_1(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
496 result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
497 self.verify_http_server_response(result[0]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
498 self.verify_expected_headers(result[1:-1]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
499 self.verify_get_called() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
500 self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
501 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
502 def test_http_1_0(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
503 result = self.send_typical_request(b'GET / HTTP/1.0\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
504 self.verify_http_server_response(result[0]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
505 self.verify_expected_headers(result[1:-1]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
506 self.verify_get_called() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
507 self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
508 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
509 def test_http_0_9(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
510 result = self.send_typical_request(b'GET / HTTP/0.9\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
511 self.assertEqual(len(result), 1) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
512 self.assertEqual(result[0], b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
513 self.verify_get_called() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
514 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
515 def test_with_continue_1_0(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
516 result = self.send_typical_request(b'GET / HTTP/1.0\r\nExpect: 100-continue\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
517 self.verify_http_server_response(result[0]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
518 self.verify_expected_headers(result[1:-1]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
519 self.verify_get_called() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
520 self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
521 |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
522 def test_with_continue_1_1(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
523 result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
524 self.assertEqual(result[0], b'HTTP/1.1 100 Continue\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
525 self.assertEqual(result[1], b'HTTP/1.1 200 OK\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
526 self.verify_expected_headers(result[2:-1]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
527 self.verify_get_called() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
528 self.assertEqual(result[-1], b'<html><body>Data</body></html>\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
529 |
|
66351
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
530 def test_header_buffering(self): |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
531 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
532 def _readAndReseek(f): |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
533 pos = f.tell() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
534 f.seek(0) |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
535 data = f.read() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
536 f.seek(pos) |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
537 return data |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
538 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
539 input = BytesIO(b'GET / HTTP/1.1\r\n\r\n') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
540 output = BytesIO() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
541 self.handler.rfile = input |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
542 self.handler.wfile = output |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
543 self.handler.request_version = 'HTTP/1.1' |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
544 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
545 self.handler.send_header('Foo', 'foo') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
546 self.handler.send_header('bar', 'bar') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
547 self.assertEqual(_readAndReseek(output), b'') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
548 self.handler.end_headers() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
549 self.assertEqual(_readAndReseek(output), |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
550 b'Foo: foo\r\nbar: bar\r\n\r\n') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
551 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
552 def test_header_unbuffered_when_continue(self): |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
553 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
554 def _readAndReseek(f): |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
555 pos = f.tell() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
556 f.seek(0) |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
557 data = f.read() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
558 f.seek(pos) |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
559 return data |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
560 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
561 input = BytesIO(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
562 output = BytesIO() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
563 self.handler.rfile = input |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
564 self.handler.wfile = output |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
565 self.handler.request_version = 'HTTP/1.1' |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
566 |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
567 self.handler.handle_one_request() |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
568 self.assertNotEqual(_readAndReseek(output), b'') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
569 result = _readAndReseek(output).split(b'\r\n') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
570 self.assertEqual(result[0], b'HTTP/1.1 100 Continue') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
571 self.assertEqual(result[1], b'HTTP/1.1 200 OK') |
|
9717153d558d
Fix issue3709 - BaseHTTPRequestHandler will buffer the headers and write only on end_headers call.
Senthil Kumaran <orsenthil@gmail.com>
parents:
65788
diff
changeset
|
572 |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
573 def test_with_continue_rejected(self): |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
574 usual_handler = self.handler # Save to avoid breaking any subsequent tests. |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
575 self.handler = RejectingSocketlessRequestHandler() |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
576 result = self.send_typical_request(b'GET / HTTP/1.1\r\nExpect: 100-continue\r\n\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
577 self.assertEqual(result[0], b'HTTP/1.1 417 Expectation Failed\r\n') |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
578 self.verify_expected_headers(result[1:-1]) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
579 # The expect handler should short circuit the usual get method by |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
580 # returning false here, so get_called should be false |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
581 self.assertFalse(self.handler.get_called) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
582 self.assertEqual(sum(r == b'Connection: close\r\n' for r in result[1:-1]), 1) |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
583 self.handler = usual_handler # Restore to avoid breaking any subsequent tests. |
|
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
584 |
|
66970
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
585 def test_request_length(self): |
|
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
586 # Issue #10714: huge request lines are discarded, to avoid Denial |
|
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
587 # of Service attacks. |
|
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
588 result = self.send_typical_request(b'GET ' + b'x' * 65537) |
|
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
589 self.assertEqual(result[0], b'HTTP/1.1 414 Request-URI Too Long\r\n') |
|
436bbc7f0aa6
Issue #10714: Limit length of incoming request in http.server to 65536 bytes
Antoine Pitrou <solipsis@pitrou.net>
parents:
66606
diff
changeset
|
590 self.assertFalse(self.handler.get_called) |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
591 |
|
67020
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
592 def test_header_length(self): |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
593 # Issue #6791: same for headers |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
594 result = self.send_typical_request( |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
595 b'GET / HTTP/1.1\r\nX-Foo: bar' + b'r' * 65537 + b'\r\n\r\n') |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
596 self.assertEqual(result[0], b'HTTP/1.1 400 Line too long\r\n') |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
597 self.assertFalse(self.handler.get_called) |
|
0b94635ed2f6
Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou
Senthil Kumaran <orsenthil@gmail.com>
parents:
66970
diff
changeset
|
598 |
|
66971
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
599 class SimpleHTTPRequestHandlerTestCase(unittest.TestCase): |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
600 """ Test url parsing """ |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
601 def setUp(self): |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
602 self.translated = os.getcwd() |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
603 self.translated = os.path.join(self.translated, 'filename') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
604 self.handler = SocketlessRequestHandler() |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
605 |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
606 def test_query_arguments(self): |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
607 path = self.handler.translate_path('/filename') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
608 self.assertEqual(path, self.translated) |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
609 path = self.handler.translate_path('/filename?foo=bar') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
610 self.assertEqual(path, self.translated) |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
611 path = self.handler.translate_path('/filename?a=b&spam=eggs#zot') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
612 self.assertEqual(path, self.translated) |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
613 |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
614 def test_start_with_double_slash(self): |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
615 path = self.handler.translate_path('//filename') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
616 self.assertEqual(path, self.translated) |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
617 path = self.handler.translate_path('//filename?foo=bar') |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
618 self.assertEqual(path, self.translated) |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
619 |
|
dc32788f0e4e
Merged revisions 87317 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
66340
diff
changeset
|
620 |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
621 def test_main(verbose=None): |
|
63558
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
622 cwd = os.getcwd() |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
623 try: |
|
63558
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
624 support.run_unittest( |
|
65028
7add45bcc9c6
Issue1491 - BaseHTTPServer incorrectly implements response code 100
Senthil Kumaran <orsenthil@gmail.com>
parents:
63558
diff
changeset
|
625 BaseHTTPRequestHandlerTestCase, |
|
63558
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
626 BaseHTTPServerTestCase, |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
627 SimpleHTTPServerTestCase, |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
628 CGIHTTPServerTestCase, |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
629 SimpleHTTPRequestHandlerTestCase, |
|
58c22d30f749
Move test_SimpleHTTPServer into test_httpservers.
Georg Brandl <georg@python.org>
parents:
62874
diff
changeset
|
630 ) |
|
47278
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
631 finally: |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
632 os.chdir(cwd) |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
633 |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
634 if __name__ == '__main__': |
|
f762a9ab69dd
Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
Georg Brandl <georg@python.org>
parents:
diff
changeset
|
635 test_main() |
