diff options
author | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 +0000 |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 +0000 |
commit | a4d9a13b7a85f2c7f55fc409056e3b9628902022 (patch) | |
tree | 978573b4ff11f036428c0a08a89085313ad990fa /test/Java | |
parent | f706866a1d840a6fc1251ad6c62e137c240967fd (diff) | |
download | scons-a4d9a13b7a85f2c7f55fc409056e3b9628902022.tar.gz |
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/Java')
-rw-r--r-- | test/Java/no-JARCHDIR.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/test/Java/no-JARCHDIR.py b/test/Java/no-JARCHDIR.py index 795689c4..d0233f6a 100644 --- a/test/Java/no-JARCHDIR.py +++ b/test/Java/no-JARCHDIR.py @@ -31,8 +31,6 @@ and when we explicity set it to None (it should not use the Java() classdir attribute at all). """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -75,13 +73,7 @@ foo/bar/a.class foo/bar/b.class """ -if string.find(test.stdout(), expect) == -1: - print "Did not find expected string in standard output." - print "Expected ==========================================================" - print expect - print "Output ============================================================" - print test.stdout() - test.fail_test() +test.must_contain_all_lines(test.stdout(), [expect]) @@ -109,13 +101,7 @@ classes/foo/bar/a.class classes/foo/bar/b.class """ -if string.find(test.stdout(), expect) == -1: - print "Did not find expected string in standard output." - print "Expected ==========================================================" - print expect - print "Output ============================================================" - print test.stdout() - test.fail_test() +test.must_contain_all_lines(test.stdout(), [expect]) |