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, 14 insertions, 1 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index b4e910a..f50f6aa 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -244,6 +244,19 @@ class TestSCons(TestCommon):
         # control character output on FC8
         # TERM can cause test failures due to control chars in prompts etc.
         os.environ['TERM'] = 'dumb'
+        
+        self.ignore_python_version=kw.get('ignore_python_version',1)
+        if kw.get('ignore_python_version',-1) != -1:
+            del kw['ignore_python_version']
+
+        if self.ignore_python_version and deprecated_python_version():
+            sconsflags = os.environ.get('SCONSFLAGS')
+            if sconsflags:
+                sconsflags = [sconsflags]
+            else:
+                sconsflags = []
+            sconsflags = sconsflags + ['--warn=no-python-version']
+            os.environ['SCONSFLAGS'] = string.join(sconsflags)
 
         apply(TestCommon.__init__, [self], kw)
 
@@ -339,7 +352,7 @@ class TestSCons(TestCommon):
         deprecation warnings.
         """
         save_sconsflags = os.environ.get('SCONSFLAGS')
-        if deprecated_python_version():
+        if self.ignore_python_version and deprecated_python_version():
             if save_sconsflags:
                 sconsflags = [save_sconsflags]
             else: