third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py - Issue 2455233002: Use Port.skips_test in copy-existing-baselines command.

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: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.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

« third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py ('K') | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

index 35acceccca7089b19b20ec130d20fe64b5a84aca..6acc7224e2ec5a56cea686a4c2c59070ff690199 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -192,10 +192,13 @@ class CopyExistingBaselinesInternal(AbstractRebaseliningCommand):

_log.debug("Existing baseline at %s, not copying over it.", new_baseline)

continue

- expectations = TestExpectations(port, [test_name])

- # TODO(qyearsley): Make sure we're also skipping copying existing baselines in

- # the case where the port only runs smoke tests and the test is a smoke test.

- if SKIP in expectations.get_expectations(test_name):

+ generic_expectations = TestExpectations(port, tests=[test_name], include_overrides=False)

+ full_expectations = TestExpectations(port, tests=[test_name], include_overrides=True)

+ # TODO(qyearsley): Change Port.skips_test so that this can be simplified.

+ if SKIP in full_expectations.get_expectations(test_name):

+ _log.debug("%s is skipped (perhaps temporarily) on %s.", test_name, port.name())

+ continue

+ if port.skips_test(test_name, generic_expectations, full_expectations):

_log.debug("%s is skipped on %s.", test_name, port.name())

continue