diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
| commit | e112f6b49c9063e6a584ff4f7abf9d7a644eef30 (patch) | |
| tree | 978573b4ff11f036428c0a08a89085313ad990fa /test/SCONSFLAGS.py | |
| parent | 9405dad6e18db3934eec7b992e12a2016b1466db (diff) | |
| download | SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.zip SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.gz SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.bz2 | |
Commonize new string-search-in-output methods:
test.must_contain_all_lines()
test.must_contain_any_line()
test.must_not_contain_any_line()
Update tests to use them. Remove "import string" lines where the
change made them unnecessary.
Diffstat (limited to 'test/SCONSFLAGS.py')
| -rw-r--r-- | test/SCONSFLAGS.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py index fd0049c..e64e687 100644 --- a/test/SCONSFLAGS.py +++ b/test/SCONSFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import TestCmd import TestSCons @@ -61,8 +60,8 @@ test.run(stdout = expect, # for the deprecation warning. test.run(arguments = "-H") -test.fail_test(string.find(test.stdout(), 'Help text.') >= 0) -test.fail_test(string.find(test.stdout(), '-H, --help-options') == -1) +test.must_not_contain_any_line(test.stdout(), ['Help text.']) +test.must_contain_all_lines(test.stdout(), ['-H, --help-options']) os.environ['SCONSFLAGS'] = '-Z' |