chromium/src
0
Fork 0
Code Activity

Revert "[WPT Import] Make importer use vpython rather than python"

Browse Source 
This reverts commit c75217d610.

Reason for revert: https://crbug.com/1095643
Broke run_web_tests.py for Windows developers

Change-Id: Id7422be7bed874a65cf35da952978f42f0cb76c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248725
Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779337}
This commit is contained in:
Robert Ma
2020-06-17 15:44:20 +00:00
committed by Commit Bot
parent a48db56568
commit c3debeea12
3 changed files with 5 additions and 5 deletions

2
third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py vendored

@ -487,7 +487,7 @@ class TestImporterTest(LoggingTestCase):
MOCK_WEB_TESTS + 'external/wpt/MANIFEST.json', '{}')
importer._generate_manifest()
self.assertEqual(host.executive.calls, [[
'vpython',
'python',
'/mock-checkout/third_party/blink/tools/blinkpy/third_party/wpt/wpt/wpt',
'manifest',
'--no-download',

2
third_party/blink/tools/blinkpy/w3c/wpt_manifest.py vendored

@ -279,7 +279,7 @@ class WPTManifest(object):
wpt_exec_path = finder.path_from_blink_tools('blinkpy', 'third_party',
'wpt', 'wpt', 'wpt')
cmd = [
'vpython', wpt_exec_path, 'manifest', '--no-download',
'python', wpt_exec_path, 'manifest', '--no-download',
'--tests-root', dest_path
]

6
third_party/blink/tools/blinkpy/w3c/wpt_manifest_unittest.py vendored

@ -24,7 +24,7 @@ class WPTManifestUnitTest(unittest.TestCase):
{manifest_path: '{"manifest": "base"}'})
self.assertEqual(host.executive.calls, [[
'vpython',
'python',
'/mock-checkout/third_party/blink/tools/blinkpy/third_party/wpt/wpt/wpt',
'manifest',
'--no-download',
@ -47,7 +47,7 @@ class WPTManifestUnitTest(unittest.TestCase):
{manifest_path: '{"manifest": "base"}'})
self.assertEqual(host.executive.calls, [[
'vpython',
'python',
'/mock-checkout/third_party/blink/tools/blinkpy/third_party/wpt/wpt/wpt',
'manifest',
'--no-download',
@ -68,7 +68,7 @@ class WPTManifestUnitTest(unittest.TestCase):
port = TestPort(host)
WPTManifest.ensure_manifest(port, 'wpt_internal')
self.assertEqual(host.executive.calls, [[
'vpython',
'python',
'/mock-checkout/third_party/blink/tools/blinkpy/third_party/wpt/wpt/wpt',
'manifest',
'--no-download',