[Python-checkins] r75255 - in python/trunk: Lib/test/regrtest.py Misc/NEWS

Mon Oct 5 19:03:09 CEST 2009

Author: r.david.murray
Date: Mon Oct 5 19:03:09 2009
New Revision: 75255
Log:
Issue #7058: Added save/restore for argv and os.environ to runtest_inner
in regrtest, with warnings if the called test modifies them.
Modified:
 python/trunk/Lib/test/regrtest.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/test/regrtest.py
==============================================================================

--- python/trunk/Lib/test/regrtest.py	(original)
+++ python/trunk/Lib/test/regrtest.py	Mon Oct 5 19:03:09 2009
@@ -641,6 +641,10 @@
 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 capture_stdout:
 sys.stdout = capture_stdout
@@ -663,6 +667,17 @@
 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 test_support.ResourceDenied, msg:
 if not quiet:
 print test, "skipped --", msg
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Oct 5 19:03:09 2009
@@ -1436,6 +1436,9 @@
 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.
 
 - Issue #6806: test_platform failed under OS X 10.6.0 because ``sw_ver`` leaves
