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
........
This commit is contained in:
Antoine Pitrou 2009-11-03 16:43:03 +00:00
parent 675b33a702
commit 6d332bedc8
1 changed files with 8 additions and 1 deletions

View File

@ -9,7 +9,9 @@ from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, demo_app
from wsgiref.simple_server import make_server from wsgiref.simple_server import make_server
from StringIO import StringIO from StringIO import StringIO
from SocketServer import BaseServer from SocketServer import BaseServer
import re, sys import os
import re
import sys
from test import test_support from test import test_support
@ -386,6 +388,11 @@ class HeaderTests(TestCase):
class ErrorHandler(BaseCGIHandler): class ErrorHandler(BaseCGIHandler):
"""Simple handler subclass for testing BaseHandler""" """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): def __init__(self,**kw):
setup_testing_defaults(kw) setup_testing_defaults(kw)
BaseCGIHandler.__init__( BaseCGIHandler.__init__(