From d6fcd562bf018003d0f4b3aeed4999e6d836541a Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 3 Nov 2009 17:21:14 +0000 Subject: [PATCH] Merged revisions 76090 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76090 | antoine.pitrou | 2009-11-03 18:20:10 +0100 (mar., 03 nov. 2009) | 9 lines Merged revisions 76086 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76086 | antoine.pitrou | 2009-11-03 17:41:20 +0100 (mar., 03 nov. 2009) | 3 lines Try to make test_wsgiref less fragile against environment changes by other tests ........ ................ --- Lib/test/test_wsgiref.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py index 438d8ec8951..0b1a6373824 100755 --- a/Lib/test/test_wsgiref.py +++ b/Lib/test/test_wsgiref.py @@ -9,7 +9,9 @@ from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app from wsgiref.simple_server import make_server from io import StringIO, BytesIO, BufferedReader from socketserver import BaseServer -import re, sys +import os +import re +import sys from test import support @@ -444,6 +446,11 @@ class HeaderTests(TestCase): class ErrorHandler(BaseCGIHandler): """Simple handler subclass for testing BaseHandler""" + # BaseHandler records the OS environment at import time, but envvars + # might have been changed later by other tests, which trips up + # HandlerTests.testEnviron(). + os_environ = dict(os.environ.items()) + def __init__(self,**kw): setup_testing_defaults(kw) BaseCGIHandler.__init__(