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

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py

Issue 2648783004: Move exportable_commits_since to webkitpy/w3c/common.py. (Closed)
Patch Set: Created 3 years, 11 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
Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
index 1eae98a86f82ebb105d9c4c88b9217672c99d24b..2db7810865e34362ab1c433f0da93af95be0d3f9 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.py
@@ -5,12 +5,10 @@
import logging
from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.chromium_commit import ChromiumCommit
+from webkitpy.w3c.common import exportable_commits_since
_log = logging.getLogger(__name__)
-CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/external/wpt/'
-
class TestExporter(object):
@@ -77,7 +75,7 @@ class TestExporter(object):
_log.info('chromium@%s', chromium_commit.sha)
_log.info('(%d behind chromium@origin/master)', chromium_commit.num_behind_master())
- exportable_commits = self.exportable_commits_since(chromium_commit.sha)
+ exportable_commits = exportable_commits_since(chromium_commit.sha, self.host, self.local_wpt)
if not exportable_commits:
_log.info('No exportable commits found in Chromium, stopping.')
@@ -115,31 +113,3 @@ class TestExporter(object):
if response_data:
data, status_code = self.wpt_github.add_label(response_data['number'])
_log.info('Add label response (status %s): %s', status_code, data)
-
- def exportable_commits_since(self, commit):
- """Returns SHAs of exportable commits since `commit` in chronological order.
-
- Args:
- commit: The SHA of the Chromium commit from which this method will look.
- """
- repo_root = self.host.executive.run_command([
- 'git', 'rev-parse', '--show-toplevel'
- ]).strip()
-
- commits = self.host.executive.run_command([
- 'git', 'rev-list', '{}..HEAD'.format(commit), '--reverse',
- '--', repo_root + '/' + CHROMIUM_WPT_DIR
- ]).splitlines()
-
- chromium_commits = [ChromiumCommit(self.host, sha=c) for c in commits]
-
- def is_exportable(chromium_commit):
- patch = chromium_commit.format_patch()
- return (
- patch
- and self.local_wpt.test_patch(patch)
- and 'NOEXPORT=true' not in chromium_commit.message()
- and not chromium_commit.message().startswith('Import ')
- )
-
- return [c for c in chromium_commits if is_exportable(c)]

Powered by Google App Engine
This is Rietveld 408576698