Merged revisions 75255 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75255 | r.david.murray | 2009-10-05 13:03:09 -0400 (Mon, 05 Oct 2009) | 3 lines

  Issue #7058: Added save/restore for argv and os.environ to runtest_inner
  in regrtest, with warnings if the called test modifies them.
........

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 157420fd573cbc1c1d51eac931d4e99abffa0a0b..a544d679cf4be6f01c51fadad2cfe815177b3b0c 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -682,6 +682,10 @@ def runtest_inner(test, verbose, quiet,
     refleak = False  # True if the test leaked references.
     try:
         save_stdout = sys.stdout
+        # Save various things that tests may mess up so we can restore
+        # them afterward.
+        save_environ = dict(os.environ)
+        save_argv = sys.argv[:]
         try:
             if test.startswith('test.'):
                 abstest = test
@@ -702,6 +706,17 @@ def runtest_inner(test, verbose, quiet,
             test_time = time.time() - start_time
         finally:
             sys.stdout = save_stdout
+            # Restore what we saved if needed, but also complain if the test
+            # changed it so that the test may eventually get fixed.
+            if not os.environ == save_environ:
+                if not quiet:
+                    print("Warning: os.environ was modified by", test)
+                os.environ.clear()
+                os.environ.update(save_environ)
+            if not sys.argv == save_argv:
+                if not quiet:
+                    print("Warning: argv was modified by", test)
+                sys.argv[:] = save_argv
     except support.ResourceDenied as msg:
         if not quiet:
             print(test, "skipped --", msg)

diff --git a/Misc/NEWS b/Misc/NEWS
index 42c7454bf59dadd69dea28e9ff557ec36db79e9a..3ff73ed019ee6c8c8b1fa8497d844daf493704fa 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -260,6 +260,9 @@ Documentation
 Tests
 -----
 
+- Issue #7058: Added save/restore for argv and os.environ to runtest_inner
+  in regrtest, with warnings if the called test modifies them.
+
 - Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
 
 - Fixed tests in importlib.test.source.test_abc_loader that were masking