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

Unified Diff: sky/tools/webkitpy/layout_tests/port/base.py

Issue 762703005: Fix test_sky commandline printing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | sky/tools/webkitpy/layout_tests/views/printing.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/webkitpy/layout_tests/port/base.py
diff --git a/sky/tools/webkitpy/layout_tests/port/base.py b/sky/tools/webkitpy/layout_tests/port/base.py
index 8303faff0d437a126095ba4843151b8cb923dc69..85101c92676af6dc87d9ddf28597792294ba42c1 100644
--- a/sky/tools/webkitpy/layout_tests/port/base.py
+++ b/sky/tools/webkitpy/layout_tests/port/base.py
@@ -228,7 +228,7 @@ class Port(object):
return ['--dump-render-tree']
if driver_name == self.MOJO_SHELL_NAME:
return [
- '--args-for=mojo:native_viewport_service --use-headless-config --use-osmesa',
+ '--args-for="mojo:native_viewport_service --use-headless-config --use-osmesa"',
'--content-handlers=text/sky,mojo:sky_viewer',
'--url-mappings=mojo:window_manager=mojo:sky_tester',
'mojo:window_manager',
@@ -1091,18 +1091,20 @@ class Port(object):
be the case when the tests aren't run on the host platform."""
return True
+ def server_command_line(self):
+ return [
+ self.path_to_script('sky_server'),
+ '-t', self.get_option('configuration'),
+ self.path_from_chromium_base(),
+ '8000',
+ ]
+
def start_http_server(self, additional_dirs, number_of_drivers):
"""Start a web server. Raise an error if it can't start or is already running.
Ports can stub this out if they don't need a web server to be running."""
assert not self._http_server, 'Already running an http server.'
-
- self._http_server = subprocess.Popen([
- self.path_to_script('sky_server'),
- '-t', self.get_option('configuration'),
- self.path_from_chromium_base(),
- '8000',
- ])
+ self._http_server = subprocess.Popen(self.server_command_line())
def start_websocket_server(self):
"""Start a web server. Raise an error if it can't start or is already running.
« no previous file with comments | « no previous file | sky/tools/webkitpy/layout_tests/views/printing.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698