| OLD | NEW |
| 1 # Copyright (C) 2013 Google Inc. All rights reserved. | 1 # Copyright (C) 2013 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 14 matching lines...) Expand all Loading... |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 """A class to help start/stop the crash service used by layout tests.""" | 29 """A class to help start/stop the crash service used by layout tests.""" |
| 30 | 30 |
| 31 import logging | 31 import logging |
| 32 import os | 32 import os |
| 33 import time | 33 import time |
| 34 | 34 |
| 35 from webkitpy.layout_tests.servers import http_server_base | 35 from webkitpy.layout_tests.servers import server_base |
| 36 | 36 |
| 37 | 37 |
| 38 _log = logging.getLogger(__name__) | 38 _log = logging.getLogger(__name__) |
| 39 | 39 |
| 40 | 40 |
| 41 class CrashService(http_server_base.HttpServerBase): | 41 class CrashService(server_base.ServerBase): |
| 42 | 42 |
| 43 def __init__(self, port_obj, crash_dumps_dir): | 43 def __init__(self, port_obj, crash_dumps_dir): |
| 44 """Args: | 44 """Args: |
| 45 crash_dumps_dir: the absolute path to the directory where to store cra
sh dumps | 45 crash_dumps_dir: the absolute path to the directory where to store cra
sh dumps |
| 46 """ | 46 """ |
| 47 # Webkit tests | 47 # Webkit tests |
| 48 http_server_base.HttpServerBase.__init__(self, port_obj) | 48 super(CrashService, self).__init__(port_obj) |
| 49 self._name = 'CrashService' | 49 self._name = 'CrashService' |
| 50 self._crash_dumps_dir = crash_dumps_dir | 50 self._crash_dumps_dir = crash_dumps_dir |
| 51 | 51 |
| 52 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 52 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
| 53 | 53 |
| 54 def _spawn_process(self): | 54 def _spawn_process(self): |
| 55 start_cmd = [self._port_obj._path_to_crash_service(), | 55 start_cmd = [self._port_obj._path_to_crash_service(), |
| 56 '--dumps-dir=%s' % self._crash_dumps_dir, | 56 '--dumps-dir=%s' % self._crash_dumps_dir, |
| 57 '--no-window'] | 57 '--no-window'] |
| 58 _log.debug('Starting crash service, cmd = "%s"' % " ".join(start_cmd)) | 58 _log.debug('Starting crash service, cmd = "%s"' % " ".join(start_cmd)) |
| (...skipping 19 matching lines...) Expand all Loading... |
| 78 # FIXME: https://bugs.webkit.org/show_bug.cgi?id=106838 | 78 # FIXME: https://bugs.webkit.org/show_bug.cgi?id=106838 |
| 79 # We need to kill all of the child processes as well as the | 79 # We need to kill all of the child processes as well as the |
| 80 # parent, so we can't use executive.kill_process(). | 80 # parent, so we can't use executive.kill_process(). |
| 81 # | 81 # |
| 82 # If this is actually working, we should figure out a clean API. | 82 # If this is actually working, we should figure out a clean API. |
| 83 self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid",
self._pid], error_handler=self._executive.ignore_error) | 83 self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid",
self._pid], error_handler=self._executive.ignore_error) |
| 84 else: | 84 else: |
| 85 self._executive.kill_process(self._pid) | 85 self._executive.kill_process(self._pid) |
| 86 return False | 86 return False |
| 87 return True | 87 return True |
| OLD | NEW |