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/implicit-cache | |
| 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/implicit-cache')
| -rw-r--r-- | test/implicit-cache/DualTargets.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/implicit-cache/DualTargets.py b/test/implicit-cache/DualTargets.py index cf41640a..a2afcc5f 100644 --- a/test/implicit-cache/DualTargets.py +++ b/test/implicit-cache/DualTargets.py @@ -29,8 +29,6 @@ Test that --implicit-cache works correctly in conjonction with a builder that produces multiple targets. """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -84,7 +82,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') == -1) +test.must_contain_all_lines(test.stdout(), ['Copy']) # Double check that targets are not rebuilt. test.run(arguments = '.') @@ -93,7 +91,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') != -1) +test.must_not_contain_any_line(test.stdout(), ['Copy']) # Double check that targets are not rebuilt even with --implicit-cache test.run(arguments = '--implicit-cache x.a') @@ -102,7 +100,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') != -1) +test.must_not_contain_any_line(test.stdout(), ['Copy']) # Double check that targets are not rebuilt even with --implicit-cache # a second time. @@ -112,7 +110,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') != -1) +test.must_not_contain_any_line(test.stdout(), ['Copy']) # Double check that targets are not rebuilt if we reran without # --implicit-cache @@ -122,7 +120,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') != -1) +test.must_not_contain_any_line(test.stdout(), ['Copy']) # Double check again test.run(arguments = '.') @@ -131,7 +129,7 @@ test.must_exist('x.lib') test.must_exist('x.a') test.must_exist('x.b') -test.fail_test(string.find(test.stdout(), 'Copy') != -1) +test.must_not_contain_any_line(test.stdout(), ['Copy']) # Then only of the targets using --implicit-cache test.pass_test() |