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/exceptions.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/exceptions.py')
-rw-r--r-- | test/exceptions.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/test/exceptions.py b/test/exceptions.py index 98e3e83..12efdf0 100644 --- a/test/exceptions.py +++ b/test/exceptions.py @@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os import re -import string import sys import TestSCons import TestCmd @@ -122,18 +121,7 @@ expected_stderr_list = [ test.run(arguments = '-j7 -k .', status = 2, stderr = None) -missing = [] -for es in expected_stderr_list: - if string.find(test.stderr(), es) == -1: - missing.append(es) - -if missing: - sys.stderr.write("Missing the following lines from stderr:\n") - for m in missing: - sys.stderr.write(m) - sys.stderr.write('STDERR ===============================================\n') - sys.stderr.write(test.stderr()) - test.fail_test(1) +test.must_contain_all_lines(test.stderr(), expected_stderr_list) test.pass_test() |