Index: Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
index 9fa219093a8d358e492c0cf948490a38e937c73c..3f4d70d772698a2d60dd24a83081db288ae09644 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
@@ -262,6 +262,7 @@ class SingleTestRunner(object): |
found_a_pass = False |
text = driver_output.text or '' |
lines = text.strip().splitlines() |
+ lines = [line.strip() for line in lines] |
header = 'This is a testharness.js-based test.' |
footer = 'Harness: the test ran to completion.' |
if not lines or not header in lines: |
@@ -270,12 +271,17 @@ class SingleTestRunner(object): |
return True, [test_failures.FailureTestHarnessAssertion()] |
for line in lines: |
+ if line == header or line == footer or line.startswith('PASS'): |
+ continue |
+ # CONSOLE output can happen during tests and shouldn't break them. |
+ if line.startswith('CONSOLE'): |
+ continue |
+ |
if line.startswith('FAIL') or line.startswith('TIMEOUT'): |
return True, [test_failures.FailureTestHarnessAssertion()] |
# Fail the test if there is any unrecognized output. |
- if line != header and line != footer and not line.startswith('PASS'): |
- return True, [test_failures.FailureTestHarnessAssertion()] |
+ return True, [test_failures.FailureTestHarnessAssertion()] |
return True, [] |
def _is_render_tree(self, text): |