Steven checked in some changes yesterday which fixed a great number of

failing tests by setting SCONSFLAGS='-warn=no-python-version' in def
run() in TestSCons.py yesterday, where previously it was done in def
__init__(...).

This fixed most of the broken tests, but broke some of the working tests.
I readded the logic to def __init__

In addition I've added an extra arg to the __init__ for TestSCons.py
ignore_python_version (which defaults to true).
For those tests which need to be able to see the deprecation and/or
test the functionality of the deprecation.

1 files changed, 1 insertions, 6 deletions

diff --git a/test/python-version.py b/test/python-version.py
index fbebf8d..8230fd3 100644
--- a/test/python-version.py
+++ b/test/python-version.py
@@ -36,7 +36,7 @@ import string
 import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
+test = TestSCons.TestSCons(match = TestCmd.match_re_dotall,ignore_python_version=0)
 
 test.write('SConstruct', "\n")
 
@@ -54,11 +54,6 @@ else:
 
     if TestSCons.deprecated_python_version():
 
-        sconsflags = os.environ.get('SCONSFLAGS')
-        if sconsflags:
-            sconsflags = string.replace(sconsflags, '--warn=no-python-version', '')
-            os.environ['SCONSFLAGS'] = sconsflags
-
         test.run(arguments = '-Q', stderr = TestSCons.deprecated_python_expr)
 
     else: