summaryrefslogtreecommitdiffstats
path: root/test/scons-time/run/subversion.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-02-06 14:55:23 (GMT)
committerSteven Knight <knight@baldmt.com>2009-02-06 14:55:23 (GMT)
commite112f6b49c9063e6a584ff4f7abf9d7a644eef30 (patch)
tree978573b4ff11f036428c0a08a89085313ad990fa /test/scons-time/run/subversion.py
parent9405dad6e18db3934eec7b992e12a2016b1466db (diff)
downloadSCons-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/subversion.py')
-rw-r--r--test/scons-time/run/subversion.py4
1 files changed, 3 insertions, 1 deletions
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()