summaryrefslogtreecommitdiffstats
path: root/test/Errors/non-executable-file.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/Errors/non-executable-file.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/Errors/non-executable-file.py')
-rw-r--r--test/Errors/non-executable-file.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/Errors/non-executable-file.py b/test/Errors/non-executable-file.py
index d6e018b..3d5cd5b 100644
--- a/test/Errors/non-executable-file.py
+++ b/test/Errors/non-executable-file.py
@@ -93,11 +93,6 @@ else:
Permission_denied % (not_executable, 'f1'),
permission_denied % (not_executable, 'f1'),
]
- error_message_not_found = 1
- for err in errs:
- if string.find(test.stderr(), err) != -1:
- error_message_not_found = None
- break
- test.fail_test(error_message_not_found)
+ test.must_contain_any_line(test.stderr(), errs)
test.pass_test()