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/AR/ARCOMSTR.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/AR/ARCOMSTR.py')
| -rw-r--r-- | test/AR/ARCOMSTR.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py index 914031b..f0a6158 100644 --- a/test/AR/ARCOMSTR.py +++ b/test/AR/ARCOMSTR.py @@ -30,7 +30,6 @@ the displayed archiver string. """ import TestSCons -import string _python_ = TestSCons._python_ @@ -67,8 +66,7 @@ test.write('file.2', "file.2\n/*ar*/\n") test.run() expect = 'Archiving output.lib from file.1 file.2' -test.fail_test(string.find(test.stdout(), expect) == -1) - +test.must_contain_all_lines(test.stdout(), [expect]) test.must_match('output.lib', "file.1\nfile.2\n") |