Tools/Scripts/webkitpy/layout_tests/controllers/manager.py - Issue 20830003: Get rid of the distinction between modifiers and expectations.

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/controllers/manager.py

Issue 20830003: Get rid of the distinction between modifiers and expectations. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: clean up a couple things Created 7 years, 5 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 | Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py » ('j') | Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

index fbbeda272767c9edc703dde0bfa7eb069bbbc2cb..59b0f9b46ab383d212a16cc8058ad5a7890d90ed 100644

--- a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -139,12 +139,11 @@ class Manager(object):

return self._is_http_test(test_file) or self._is_perf_test(test_file)

def _test_is_expected_missing(self, test_file):

- return (self._expectations.model().has_keyword(test_file, test_expectations.MISSING_KEYWORD)

- or self._expectations.model().has_keyword(test_file, test_expectations.NEEDS_REBASELINE_KEYWORD)

- or self._expectations.model().has_keyword(test_file, test_expectations.NEEDS_MANUAL_REBASELINE_KEYWORD))

+ expectations = self._expectations.model().get_expectations(test_file)

+ return test_expectations.MISSING in expectations or test_expectations.NEEDS_REBASELINE in expectations or test_expectations.NEEDS_MANUAL_REBASELINE in expectations

Dirk Pranke 2013/07/26 23:07:28 Nit: Maybe push this into TetsExpectationsLine.is_

def _test_is_slow(self, test_file):

- return self._expectations.has_modifier(test_file, test_expectations.SLOW)

+ return test_expectations.SLOW in self._expectations.model().get_expectations(test_file)

Dirk Pranke 2013/07/26 23:07:28 Nit: maybe push this into TestExpectationsLine.tes

def needs_servers(self, test_names):

return any(self._test_requires_lock(test_name) for test_name in test_names)