Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 2455233002: Use Port.skips_test in copy-existing-baselines command. (Closed)
Patch Set: For copying existing baselines, continue skipping if test is skipped in generic expectations. Created 4 years, 2 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 | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index db5290c411699767897d69c4115867e352f06667..3b80975914069e15ffdac1be71ddd0a6e5602036 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -930,7 +930,7 @@ class Port(object):
"""Checks whether the given test is skipped for this port.
This should return True if the test is skipped because the port
- runs smoke tests only, or because there's a skip test expectation line.
+ runs smoke tests only, or because the
chenwilliam 2016/10/31 22:49:29 I think this patch truncated the comment on accide
qyearsley 2016/10/31 23:05:21 Good catch, thanks! I'll fix this in a follow-up.
"""
fs = self.host.filesystem
if self.default_smoke_test_only():
@@ -938,6 +938,12 @@ class Port(object):
if fs.exists(smoke_test_filename) and test not in fs.read_text_file(smoke_test_filename):
return True
+ # In general, Skip lines in the generic expectations file indicate
+ # that the test is temporarily skipped, whereas if the test is skipped
+ # in another file (e.g. WontFix in NeverFixTests), then the test may
+ # always be skipped for this port.
+ # TODO(qyearsley): Simplify this so that it doesn't rely on having
+ # two copies of the test expectations.
return (SKIP in full_expectations.get_expectations(test) and
SKIP not in generic_expectations.get_expectations(test))
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698