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

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver.py

Issue 2399613002: Don't access Port._filesystem directly (use Port.host.filesystem instead). (Closed)
Patch Set: Created 4 years, 2 months 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
OLDNEW
1 # Copyright (C) 2011 Google Inc. All rights reserved. 1 # Copyright (C) 2011 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 self._start(pixel_tests, per_test_args) 303 self._start(pixel_tests, per_test_args)
304 self._run_post_start_tasks() 304 self._run_post_start_tasks()
305 305
306 def _setup_environ_for_driver(self, environment): 306 def _setup_environ_for_driver(self, environment):
307 if self._profiler: 307 if self._profiler:
308 environment = self._profiler.adjusted_environment(environment) 308 environment = self._profiler.adjusted_environment(environment)
309 return environment 309 return environment
310 310
311 def _start(self, pixel_tests, per_test_args, wait_for_ready=True): 311 def _start(self, pixel_tests, per_test_args, wait_for_ready=True):
312 self.stop() 312 self.stop()
313 self._driver_tempdir = self._port._filesystem.mkdtemp(prefix='%s-' % sel f._port.driver_name()) 313 self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
314 server_name = self._port.driver_name() 314 server_name = self._port.driver_name()
315 environment = self._port.setup_environ_for_server() 315 environment = self._port.setup_environ_for_server()
316 environment = self._setup_environ_for_driver(environment) 316 environment = self._setup_environ_for_driver(environment)
317 self._crashed_process_name = None 317 self._crashed_process_name = None
318 self._crashed_pid = None 318 self._crashed_pid = None
319 self._leaked = False 319 self._leaked = False
320 self._leak_log = None 320 self._leak_log = None
321 cmd_line = self.cmd_line(pixel_tests, per_test_args) 321 cmd_line = self.cmd_line(pixel_tests, per_test_args)
322 self._server_process = self._port._server_process_constructor( 322 self._server_process = self._port._server_process_constructor(
323 self._port, server_name, cmd_line, environment, more_logging=self._p ort.get_option("driver_logging")) 323 self._port, server_name, cmd_line, environment, more_logging=self._p ort.get_option("driver_logging"))
(...skipping 28 matching lines...) Expand all
352 return self._server_process.pid() 352 return self._server_process.pid()
353 353
354 def stop(self, timeout_secs=0.0): 354 def stop(self, timeout_secs=0.0):
355 if self._server_process: 355 if self._server_process:
356 self._server_process.stop(timeout_secs) 356 self._server_process.stop(timeout_secs)
357 self._server_process = None 357 self._server_process = None
358 if self._profiler: 358 if self._profiler:
359 self._profiler.profile_after_exit() 359 self._profiler.profile_after_exit()
360 360
361 if self._driver_tempdir: 361 if self._driver_tempdir:
362 self._port._filesystem.rmtree(str(self._driver_tempdir)) 362 self._port.host.filesystem.rmtree(str(self._driver_tempdir))
363 self._driver_tempdir = None 363 self._driver_tempdir = None
364 364
365 self._current_cmd_line = None 365 self._current_cmd_line = None
366 366
367 def cmd_line(self, pixel_tests, per_test_args): 367 def cmd_line(self, pixel_tests, per_test_args):
368 cmd = self._command_wrapper(self._port.get_option('wrapper')) 368 cmd = self._command_wrapper(self._port.get_option('wrapper'))
369 cmd.append(self._port._path_to_driver()) 369 cmd.append(self._port._path_to_driver())
370 if self._no_timeout: 370 if self._no_timeout:
371 cmd.append('--no-timeout') 371 cmd.append('--no-timeout')
372 cmd.extend(self._port.get_option('additional_driver_flag', [])) 372 cmd.extend(self._port.get_option('additional_driver_flag', []))
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 self.decoded_content = None 544 self.decoded_content = None
545 self.malloc = None 545 self.malloc = None
546 self.js_heap = None 546 self.js_heap = None
547 self.stdin_path = None 547 self.stdin_path = None
548 548
549 def decode_content(self): 549 def decode_content(self):
550 if self.encoding == 'base64' and self.content is not None: 550 if self.encoding == 'base64' and self.content is not None:
551 self.decoded_content = base64.b64decode(self.content) 551 self.decoded_content = base64.b64decode(self.content)
552 else: 552 else:
553 self.decoded_content = self.content 553 self.decoded_content = self.content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698