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/scons-time/run | |
| 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/scons-time/run')
| -rw-r--r-- | test/scons-time/run/aegis.py | 4 | ||||
| -rw-r--r-- | test/scons-time/run/option/help.py | 8 | ||||
| -rw-r--r-- | test/scons-time/run/subversion.py | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/test/scons-time/run/aegis.py b/test/scons-time/run/aegis.py index 641f129..eebd933 100644 --- a/test/scons-time/run/aegis.py +++ b/test/scons-time/run/aegis.py @@ -66,6 +66,8 @@ expect = [ content = test.read(test.workpath('foo-321-2.log')) -test.must_contain_all_lines('foo-617-2.log', content, expect, re.search) +def re_find(content, line): + return re.search(line, content) +test.must_contain_all_lines(content, expect, 'foo-617-2.log', re_find) test.pass_test() diff --git a/test/scons-time/run/option/help.py b/test/scons-time/run/option/help.py index 304992f..00a4eb7 100644 --- a/test/scons-time/run/option/help.py +++ b/test/scons-time/run/option/help.py @@ -42,18 +42,18 @@ expect = [ test.run(arguments = 'run -h') -test.must_contain_all_lines('Standard output', test.stdout(), expect) +test.must_contain_all_lines(test.stdout(), expect) test.run(arguments = 'run -?') -test.must_contain_all_lines('Standard output', test.stdout(), expect) +test.must_contain_all_lines(test.stdout(), expect) test.run(arguments = 'run --help') -test.must_contain_all_lines('Standard output', test.stdout(), expect) +test.must_contain_all_lines(test.stdout(), expect) test.run(arguments = 'help run') -test.must_contain_all_lines('Standard output', test.stdout(), expect) +test.must_contain_all_lines(test.stdout(), expect) test.pass_test() diff --git a/test/scons-time/run/subversion.py b/test/scons-time/run/subversion.py index 757f6df..d265422 100644 --- a/test/scons-time/run/subversion.py +++ b/test/scons-time/run/subversion.py @@ -67,6 +67,8 @@ expect = [ content = test.read(test.workpath('foo-617-2.log'), mode='r') -test.must_contain_all_lines('foo-617-2.log', content, expect, re.search) +def re_find(content, line): + return re.search(line, content) +test.must_contain_all_lines(content, expect, 'foo-617-2.log', re_find) test.pass_test() |