Update deprecated features to the next life-cycle stage

1 files changed, 9 insertions, 14 deletions

diff --git a/test/Deprecated/SourceSignatures/basic.py b/test/Deprecated/SourceSignatures/basic.py
index 1340bc4..c762a73 100644
--- a/test/Deprecated/SourceSignatures/basic.py
+++ b/test/Deprecated/SourceSignatures/basic.py
@@ -32,9 +32,8 @@ import TestSCons
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 
-
 base_sconstruct_contents = """\
-SetOption('warn', 'no-deprecated-source-signatures')
+SetOption('warn', 'deprecated-source-signatures')
 def build(env, target, source):
     open(str(target[0]), 'wt').write(open(str(source[0]), 'rt').read())
 B = Builder(action = build)
@@ -52,6 +51,10 @@ def write_SConstruct(test, sigtype):
     test.write('SConstruct', contents)
 
 
+expect = TestSCons.re_escape("""
+scons: warning: The env.SourceSignatures() method is deprecated;
+\tconvert your build to use the env.Decider() method instead.
+""") + TestSCons.file_expr + TestSCons.deprecated_python_expr
 
 write_SConstruct(test, 'timestamp')
 
@@ -60,8 +63,7 @@ test.write('f2.in', "f2.in\n")
 test.write('f3.in', "f3.in\n")
 test.write('f4.in', "f4.in\n")
 
-test.run(arguments = 'f1.out f3.out',
-         stderr = TestSCons.deprecated_python_expr)
+test.run(arguments = 'f1.out f3.out', stderr = expect)
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = re.escape(test.wrap_stdout("""\
@@ -70,8 +72,7 @@ build(["f2.out"], ["f2.in"])
 scons: `f3.out' is up to date.
 build(["f4.out"], ["f4.in"])
 """)),
-         stderr = TestSCons.deprecated_python_expr)
-
+         stderr = expect)
 
 
 os.utime(test.workpath('f1.in'), 
@@ -88,8 +89,7 @@ scons: `f2.out' is up to date.
 build(["f3.out"], ["f3.in"])
 scons: `f4.out' is up to date.
 """)),
-         stderr = TestSCons.deprecated_python_expr)
-
+         stderr = expect)
 
 
 # Switching to content signatures from timestamps should rebuild,
@@ -97,9 +97,7 @@ scons: `f4.out' is up to date.
 
 write_SConstruct(test, 'MD5')
 
-test.not_up_to_date(arguments = 'f1.out f2.out f3.out f4.out',
-                    stderr = TestSCons.deprecated_python_expr)
-
+test.not_up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = expect)
 
 
 test.sleep()
@@ -112,20 +110,17 @@ test.write('f4.in', "f4.in\n")
 test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None)
 
 
-
 test.touch('f1.in', os.path.getmtime(test.workpath('f1.in'))+10)
 test.touch('f3.in', os.path.getmtime(test.workpath('f3.in'))+10)
 
 test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None)
 
 
-
 write_SConstruct(test, None)
 
 test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None)
 
 
-
 test.pass_test()
 
 # Local Variables: