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/PRINT_CMD_LINE_FUNC.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/PRINT_CMD_LINE_FUNC.py')
| -rw-r--r-- | test/PRINT_CMD_LINE_FUNC.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py index a95b181..0373a1e 100644 --- a/test/PRINT_CMD_LINE_FUNC.py +++ b/test/PRINT_CMD_LINE_FUNC.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the PRINT_CMD_LINE_FUNC construction variable. """ -import string import sys import TestCmd import TestSCons @@ -60,14 +59,7 @@ expected_lines = [ "BUILDING prog%s from prog%s with" % (_exe, _obj), ] -missing_lines = filter(lambda l: string.find(test.stdout(), l) == -1, - expected_lines) -if missing_lines: - print "Expected the following lines in STDOUT:" - print "\t" + string.join(expected_lines, "\n\t") - print "ACTUAL STDOUT ==========" - print test.stdout() - test.fail_test(1) +test.must_contain_all_lines(test.stdout(), expected_lines) test.run(arguments = '-c .') |