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/packaging | |
| 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/packaging')
| -rw-r--r-- | test/packaging/rpm/tagging.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py index d0fce837..c08b4ef5 100644 --- a/test/packaging/rpm/tagging.py +++ b/test/packaging/rpm/tagging.py @@ -29,7 +29,6 @@ Test the ability to add file tags """ import os -import string import TestSCons @@ -97,6 +96,6 @@ test.fail_test( not os.popen('rpm -qpl %s' % machine_rpm).read()=='/bin/main\n') test.fail_test( not os.popen('rpm -qpl %s' % src_rpm).read()=='foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n') expect = '(0755, root, users) /bin/main' -test.fail_test(string.find(test.read('foo-1.2.3.spec'), expect) == -1) +test.must_contain_all_lines(test.read('foo-1.2.3.spec'), [expect]) test.pass_test() |