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/option/tree-all.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/option/tree-all.py')
| -rw-r--r-- | test/option/tree-all.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/option/tree-all.py b/test/option/tree-all.py index 0a0af7d..d569b31 100644 --- a/test/option/tree-all.py +++ b/test/option/tree-all.py @@ -134,10 +134,7 @@ tree2 = """ """ % locals() test.run(arguments = "--tree=all .") -if string.find(test.stdout(), tree2) == -1: - sys.stdout.write('Did not find expected tree in the following output:\n') - sys.stdout.write(test.stdout()) - test.fail_test() +test.must_contain_all_lines(test.stdout(), [tree2]) tree3 = """ +-. |