Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py - Issue 1112973002: Allow expected.txt files in testharness LayoutTests w/console warnings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py

Issue 1112973002: Allow expected.txt files in testharness LayoutTests w/console warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Test fix and dpranke nit Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Tools/Scripts/check-testharness-expected-pass ('k') | Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py b/Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py

index 570074c4afcc9e89a1e0969b40bb8a7d1af7b2f9..3d45fb8751b7405c7eb0a287bb51622c4990e8e1 100644

--- a/Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py

+++ b/Tools/Scripts/webkitpy/layout_tests/models/testharness_results.py

@@ -81,7 +81,7 @@ def is_testharness_output_passing(content_text):

return True

-def is_testharness_output_with_console_errors(content_text):

+def is_testharness_output_with_console_errors_or_warnings(content_text):

"""

Returns whether the content_text in parameter is a testharness output with

console errors.

@@ -92,7 +92,7 @@ def is_testharness_output_with_console_errors(content_text):

lines = content_text.strip().splitlines()

for line in lines:

- if line.startswith('CONSOLE ERROR:'):

+ if line.startswith('CONSOLE ERROR:') or line.startswith('CONSOLE WARNING:'):

return True

return False