diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py index 67cdefe..9032a24 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py @@ -30,7 +30,6 @@ import logging import os -import subprocess import signal from webkitpy.layout_tests.port.webkit import WebKitPort @@ -62,12 +61,6 @@ class QtPort(WebKitPort): return os.path.join(self.layout_tests_dir(), 'http', 'conf', 'apache2-debian-httpd.conf') - def _kill_all_process(self, process_name): - null = open(os.devnull) - subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), - process_name], stderr=null) - null.close() - def _shut_down_http_server(self, server_pid): """Shut down the httpd web server. Blocks until it's fully shut down. @@ -80,7 +73,7 @@ class QtPort(WebKitPort): # FIXME: This isn't ideal, since it could conflict with # lighttpd processes not started by http_server.py, # but good enough for now. - self._kill_all_process('apache2') + self._executive.kill_all('apache2') else: try: os.kill(server_pid, signal.SIGTERM) |