[Python-checkins] r76074 - python/branches/release26-maint/Lib/test/test_httpservers.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Nov  2 23:04:54 2009
New Revision: 76074

Log:
Try to fix test_wsgiref failures due to test_httpservers modifying the environment



Modified:
   python/branches/release26-maint/Lib/test/test_httpservers.py

Modified: python/branches/release26-maint/Lib/test/test_httpservers.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_httpservers.py	(original)
+++ python/branches/release26-maint/Lib/test/test_httpservers.py	Mon Nov  2 23:04:54 2009
@@ -341,13 +341,17 @@
 
 
 def test_main(verbose=None):
+    cwd = os.getcwd()
+    env = os.environ.copy()
     try:
-        cwd = os.getcwd()
         test_support.run_unittest(BaseHTTPServerTestCase,
                                   SimpleHTTPServerTestCase,
                                   CGIHTTPServerTestCase
                                   )
     finally:
+        test_support.reap_children()
+        os.environ.clear()
+        os.environ.update(env)
         os.chdir(cwd)
 
 if __name__ == '__main__':