Commit ae6c4ed0 authored by Stephen McGruer's avatar Stephen McGruer Committed by Commit Bot

Disable h2 server from running via run_blink_wptserve.py

The h2 server turns itself on by default in wptserve, but we don't
support it in blinkpy yet. To avoid quietly grabbing port 9000, pass
--no-h2 to wpt for now.

Bug: 1090491
Change-Id: Ie326b86dd1305d1173740c85afc8eecded17e277
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2229582
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774951}
parent 79aaf25b
...@@ -58,7 +58,8 @@ class WPTServe(server_base.ServerBase): ...@@ -58,7 +58,8 @@ class WPTServe(server_base.ServerBase):
wpt_script = fs.join(path_to_wpt_root, 'wpt') wpt_script = fs.join(path_to_wpt_root, 'wpt')
start_cmd = [ start_cmd = [
self._port_obj.host.executable, '-u', wpt_script, 'serve', self._port_obj.host.executable, '-u', wpt_script, 'serve',
'--config', self._config_file, '--doc_root', path_to_wpt_tests '--config', self._config_file, '--doc_root', path_to_wpt_tests,
'--no-h2',
] ]
# Some users (e.g. run_webdriver_tests.py) do not need WebSocket # Some users (e.g. run_webdriver_tests.py) do not need WebSocket
......
...@@ -33,6 +33,7 @@ class TestWPTServe(LoggingTestCase): ...@@ -33,6 +33,7 @@ class TestWPTServe(LoggingTestCase):
server._config_file, server._config_file,
'--doc_root', '--doc_root',
'/test.checkout/wtests/external/wpt', '/test.checkout/wtests/external/wpt',
'--no-h2',
]) ])
def test_init_start_cmd_with_ws_handlers(self): def test_init_start_cmd_with_ws_handlers(self):
...@@ -48,6 +49,7 @@ class TestWPTServe(LoggingTestCase): ...@@ -48,6 +49,7 @@ class TestWPTServe(LoggingTestCase):
server._config_file, server._config_file,
'--doc_root', '--doc_root',
'/test.checkout/wtests/external/wpt', '/test.checkout/wtests/external/wpt',
'--no-h2',
'--ws_doc_root', '--ws_doc_root',
'/test.checkout/wtests/external/wpt/websockets/handlers', '/test.checkout/wtests/external/wpt/websockets/handlers',
]) ])
......
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