summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpje <pje@571e12c6-e1fa-0310-aee7-ff1267fa46bd>2006-05-20 03:09:03 +0000
committerpje <pje@571e12c6-e1fa-0310-aee7-ff1267fa46bd>2006-05-20 03:09:03 +0000
commit915b75b6301cdae570d986be7dd7ee25e288daf3 (patch)
tree953dae6ade36cf083d5725aefcc9b3a47640ed7c
parent960d974d98cc50eaf156a7897a8f62806579e5d2 (diff)
downloadwsgiref-915b75b6301cdae570d986be7dd7ee25e288daf3.tar.gz
Fix test broken by Guido's date patch.
git-svn-id: svn://svn.eby-sarna.com/svnroot/wsgiref@2137 571e12c6-e1fa-0310-aee7-ff1267fa46bd
-rw-r--r--src/wsgiref/tests/test_handlers.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wsgiref/tests/test_handlers.py b/src/wsgiref/tests/test_handlers.py
index 2eb1e4b..80cbb93 100644
--- a/src/wsgiref/tests/test_handlers.py
+++ b/src/wsgiref/tests/test_handlers.py
@@ -107,14 +107,14 @@ class HandlerTests(TestCase):
"Content-Length: 4\r\n"
"\r\n"
"http")
-
+
h = TestHandler()
h.run(trivial_app2)
self.assertEqual(h.stdout.getvalue(),
"Status: 200 OK\r\n"
"\r\n"
"http")
-
+
@@ -122,7 +122,7 @@ class HandlerTests(TestCase):
def testBasicErrorOutput(self):
-
+
def non_error_app(e,s):
s('200 OK',[])
return []
@@ -170,7 +170,7 @@ class HandlerTests(TestCase):
stdpat = (
r"HTTP/%s 200 OK\r\n"
- r"Date: \w{3} \w{3} [ 0123]\d \d\d:\d\d:\d\d \d{4}\r\n"
+ r"Date: \w{3}, [ 0123]\d \w{3} \d{4} \d\d:\d\d:\d\d GMT\r\n"
r"%s" r"Content-Length: 0\r\n" r"\r\n"
)
shortpat = (
@@ -180,21 +180,21 @@ class HandlerTests(TestCase):
for ssw in "FooBar/1.0", None:
sw = ssw and "Server: %s\r\n" % ssw or ""
- for version in "1.0", "1.1":
+ for version in "1.0", "1.1":
for proto in "HTTP/0.9", "HTTP/1.0", "HTTP/1.1":
-
+
h = TestHandler(SERVER_PROTOCOL=proto)
h.origin_server = False
h.http_version = version
h.server_software = ssw
h.run(non_error_app)
self.assertEqual(shortpat,h.stdout.getvalue())
-
+
h = TestHandler(SERVER_PROTOCOL=proto)
h.origin_server = True
h.http_version = version
h.server_software = ssw
- h.run(non_error_app)
+ h.run(non_error_app)
if proto=="HTTP/0.9":
self.assertEqual(h.stdout.getvalue(),"")
else: