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

Side by Side 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 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 unified diff | Download patch
« no previous file with comments | « no previous file | sky/tools/webkitpy/layout_tests/views/printing.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 def buildbot_archives_baselines(self): 222 def buildbot_archives_baselines(self):
223 return True 223 return True
224 224
225 def additional_drt_flag(self): 225 def additional_drt_flag(self):
226 driver_name = self.driver_name() 226 driver_name = self.driver_name()
227 if driver_name == self.CONTENT_SHELL_NAME: 227 if driver_name == self.CONTENT_SHELL_NAME:
228 return ['--dump-render-tree'] 228 return ['--dump-render-tree']
229 if driver_name == self.MOJO_SHELL_NAME: 229 if driver_name == self.MOJO_SHELL_NAME:
230 return [ 230 return [
231 '--args-for=mojo:native_viewport_service --use-headless-config - -use-osmesa', 231 '--args-for="mojo:native_viewport_service --use-headless-config --use-osmesa"',
232 '--content-handlers=text/sky,mojo:sky_viewer', 232 '--content-handlers=text/sky,mojo:sky_viewer',
233 '--url-mappings=mojo:window_manager=mojo:sky_tester', 233 '--url-mappings=mojo:window_manager=mojo:sky_tester',
234 'mojo:window_manager', 234 'mojo:window_manager',
235 ] 235 ]
236 return [] 236 return []
237 237
238 def supports_per_test_timeout(self): 238 def supports_per_test_timeout(self):
239 return False 239 return False
240 240
241 def default_pixel_tests(self): 241 def default_pixel_tests(self):
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr= None) 1084 stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr= None)
1085 is_ready = self._helper.stdout.readline() 1085 is_ready = self._helper.stdout.readline()
1086 if not is_ready.startswith('ready'): 1086 if not is_ready.startswith('ready'):
1087 _log.error("layout_test_helper failed to be ready") 1087 _log.error("layout_test_helper failed to be ready")
1088 1088
1089 def requires_http_server(self): 1089 def requires_http_server(self):
1090 """Does the port require an HTTP server for running tests? This could 1090 """Does the port require an HTTP server for running tests? This could
1091 be the case when the tests aren't run on the host platform.""" 1091 be the case when the tests aren't run on the host platform."""
1092 return True 1092 return True
1093 1093
1094 def server_command_line(self):
1095 return [
1096 self.path_to_script('sky_server'),
1097 '-t', self.get_option('configuration'),
1098 self.path_from_chromium_base(),
1099 '8000',
1100 ]
1101
1094 def start_http_server(self, additional_dirs, number_of_drivers): 1102 def start_http_server(self, additional_dirs, number_of_drivers):
1095 """Start a web server. Raise an error if it can't start or is already ru nning. 1103 """Start a web server. Raise an error if it can't start or is already ru nning.
1096 1104
1097 Ports can stub this out if they don't need a web server to be running."" " 1105 Ports can stub this out if they don't need a web server to be running."" "
1098 assert not self._http_server, 'Already running an http server.' 1106 assert not self._http_server, 'Already running an http server.'
1099 1107 self._http_server = subprocess.Popen(self.server_command_line())
1100 self._http_server = subprocess.Popen([
1101 self.path_to_script('sky_server'),
1102 '-t', self.get_option('configuration'),
1103 self.path_from_chromium_base(),
1104 '8000',
1105 ])
1106 1108
1107 def start_websocket_server(self): 1109 def start_websocket_server(self):
1108 """Start a web server. Raise an error if it can't start or is already ru nning. 1110 """Start a web server. Raise an error if it can't start or is already ru nning.
1109 1111
1110 Ports can stub this out if they don't need a websocket server to be runn ing.""" 1112 Ports can stub this out if they don't need a websocket server to be runn ing."""
1111 assert not self._websocket_server, 'Already running a websocket server.' 1113 assert not self._websocket_server, 'Already running a websocket server.'
1112 1114
1113 server = pywebsocket.PyWebSocket(self, self.results_directory()) 1115 server = pywebsocket.PyWebSocket(self, self.results_directory())
1114 server.start() 1116 server.start()
1115 self._websocket_server = server 1117 self._websocket_server = server
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 1762
1761 class PhysicalTestSuite(object): 1763 class PhysicalTestSuite(object):
1762 def __init__(self, base, args): 1764 def __init__(self, base, args):
1763 self.name = base 1765 self.name = base
1764 self.base = base 1766 self.base = base
1765 self.args = args 1767 self.args = args
1766 self.tests = set() 1768 self.tests = set()
1767 1769
1768 def __repr__(self): 1770 def __repr__(self):
1769 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args) 1771 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args)
OLDNEW
« 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