Commit 61ac9e51 authored by Robert Ma's avatar Robert Ma Committed by Commit Bot

[WPT sync] Skip the great web_tests mv commit

Add a list of skipped commits when looking for exportable commits.
Currently, there is only one commit in the list: the great
LayoutTests->web_tests move.

Bug: 908445
Change-Id: Ia5cf4f66b93966e2a510a0d04932643a9e6fadaf
Reviewed-on: https://chromium-review.googlesource.com/c/1351451Reviewed-by: default avatarQuinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611009}
parent 1ef59e1d
...@@ -8,6 +8,10 @@ from blinkpy.w3c.common import CHROMIUM_WPT_DIR ...@@ -8,6 +8,10 @@ from blinkpy.w3c.common import CHROMIUM_WPT_DIR
DEFAULT_COMMIT_HISTORY_WINDOW = 10000 DEFAULT_COMMIT_HISTORY_WINDOW = 10000
SKIPPED_REVISIONS = [
# The great blink mv: https://crbug.com/843412#c13
'77578ccb4082ae20a9326d9e673225f1189ebb63',
]
def exportable_commits_over_last_n_commits( def exportable_commits_over_last_n_commits(
...@@ -63,9 +67,9 @@ def _exportable_commits_since(chromium_commit_hash, host, local_wpt, wpt_github, ...@@ -63,9 +67,9 @@ def _exportable_commits_since(chromium_commit_hash, host, local_wpt, wpt_github,
wpt_path = chromium_repo_root + '/' + CHROMIUM_WPT_DIR wpt_path = chromium_repo_root + '/' + CHROMIUM_WPT_DIR
commit_range = '{}..HEAD'.format(chromium_commit_hash) commit_range = '{}..HEAD'.format(chromium_commit_hash)
commit_hashes = host.executive.run_command([ skipped_revs = ['^' + rev for rev in SKIPPED_REVISIONS]
'git', 'rev-list', commit_range, '--reverse', '--', wpt_path command = ['git', 'rev-list', commit_range] + skipped_revs + ['--reverse', '--', wpt_path]
], cwd=absolute_chromium_dir(host)).splitlines() commit_hashes = host.executive.run_command(command, cwd=absolute_chromium_dir(host)).splitlines()
chromium_commits = [ChromiumCommit(host, sha=sha) for sha in commit_hashes] chromium_commits = [ChromiumCommit(host, sha=sha) for sha in commit_hashes]
exportable_commits = [] exportable_commits = []
errors = [] errors = []
......
...@@ -28,7 +28,7 @@ class ChromiumExportableCommitsTest(unittest.TestCase): ...@@ -28,7 +28,7 @@ class ChromiumExportableCommitsTest(unittest.TestCase):
host.executive = mock_git_commands({ host.executive = mock_git_commands({
'show': 'fake message', 'show': 'fake message',
'rev-list': 'add087a97844f4b9e307d9a216940582d96db306', 'rev-list': 'add087a97844f4b9e307d9a216940582d96db306',
'rev-parse': 'add087a97844f4b9e307d9a216940582d96db306', 'rev-parse': '/mock-checkout/src',
'crrev-parse': 'add087a97844f4b9e307d9a216940582d96db306', 'crrev-parse': 'add087a97844f4b9e307d9a216940582d96db306',
'diff': 'fake diff', 'diff': 'fake diff',
'diff-tree': (RELATIVE_WEB_TESTS + 'external/wpt/some\n' + 'diff-tree': (RELATIVE_WEB_TESTS + 'external/wpt/some\n' +
...@@ -43,8 +43,8 @@ class ChromiumExportableCommitsTest(unittest.TestCase): ...@@ -43,8 +43,8 @@ class ChromiumExportableCommitsTest(unittest.TestCase):
self.assertIsInstance(commits[0], ChromiumCommit) self.assertIsInstance(commits[0], ChromiumCommit)
self.assertEqual(host.executive.calls, [ self.assertEqual(host.executive.calls, [
['git', 'rev-parse', '--show-toplevel'], ['git', 'rev-parse', '--show-toplevel'],
['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--', ['git', 'rev-list', 'beefcafe..HEAD', '^77578ccb4082ae20a9326d9e673225f1189ebb63',
'add087a97844f4b9e307d9a216940582d96db306/' + RELATIVE_WEB_TESTS + 'external/wpt/'], '--reverse', '--', '/mock-checkout/src/' + RELATIVE_WEB_TESTS + 'external/wpt/'],
['git', 'footers', '--position', 'add087a97844f4b9e307d9a216940582d96db306'], ['git', 'footers', '--position', 'add087a97844f4b9e307d9a216940582d96db306'],
['git', 'show', '--format=%B', '--no-patch', 'add087a97844f4b9e307d9a216940582d96db306'], ['git', 'show', '--format=%B', '--no-patch', 'add087a97844f4b9e307d9a216940582d96db306'],
['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'add087a97844f4b9e307d9a216940582d96db306', '--', ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'add087a97844f4b9e307d9a216940582d96db306', '--',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment