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/ENV.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/ENV.py')
| -rw-r--r-- | test/ENV.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/ENV.py b/test/ENV.py index 9a39f30..d7c543d 100644 --- a/test/ENV.py +++ b/test/ENV.py @@ -25,8 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import sys + import TestSCons _python_ = TestSCons._python_ @@ -79,7 +79,11 @@ print 'FOO:', os.environ['FOO'] test.run() -test.fail_test(string.find(test.stdout(), "LIST: foo%sbar"%os.pathsep) == -1) -test.fail_test(string.find(test.stdout(), "FOO: foo") == -1) +expect = [ + "LIST: foo%sbar" % os.pathsep, + "FOO: foo", +] + +test.must_contain_all_lines(test.stdout(), expect) test.pass_test() |