Diff
Modified: trunk/Tools/ChangeLog (89511 => 89512)
--- trunk/Tools/ChangeLog 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/ChangeLog 2011-06-23 01:17:31 UTC (rev 89512)
@@ -1,3 +1,21 @@
+2011-06-22 Dirk Pranke <[email protected]>
+
+ Reviewed by Ojan Vafai.
+
+ new-run-webkit-tests: remove obsolete port.shut_down_http_server method
+ https://bugs.webkit.org/show_bug.cgi?id=59993
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ * Scripts/webkitpy/layout_tests/port/win.py:
+
2011-06-22 Luke Macpherson <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -912,13 +912,6 @@
This is likely used only by wdiff_text()"""
raise NotImplementedError('Port._path_to_wdiff')
- def _shut_down_http_server(self, pid):
- """Forcefully and synchronously kills the web server.
-
- This routine should only be called from http_server.py or its
- subclasses."""
- raise NotImplementedError('Port._shut_down_http_server')
-
def _webkit_baseline_path(self, platform):
"""Return the full path to the top of the baseline tree for a
given platform."""
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -288,7 +288,6 @@
self.assertVirtual(port._path_to_lighttpd_modules)
self.assertVirtual(port._path_to_lighttpd_php)
self.assertVirtual(port._path_to_wdiff)
- self.assertVirtual(port._shut_down_http_server, None)
def test_virtual_driver_method(self):
self.assertRaises(NotImplementedError, base.Driver, base.Port(),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -30,8 +30,6 @@
"""Chromium Linux implementation of the Port interface."""
import logging
-import os
-import signal
import chromium
@@ -204,27 +202,3 @@
def _is_redhat_based(self):
return self._filesystem.exists(self._filesystem.join('/etc', 'redhat-release'))
-
- def _shut_down_http_server(self, server_pid):
- """Shut down the lighttpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # server_pid is not set when "http_server.py stop" is run manually.
- if server_pid is None:
- # TODO(mmoss) This isn't ideal, since it could conflict with
- # lighttpd processes not started by http_server.py,
- # but good enough for now.
- self._executive.kill_all("lighttpd")
- self._executive.kill_all("apache2")
- else:
- try:
- os.kill(server_pid, signal.SIGTERM)
- # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
- except OSError:
- # Sometimes we get a bad PID (e.g. from a stale httpd.pid
- # file), so if kill fails on the given PID, just try to
- # 'killall' web servers.
- self._shut_down_http_server(None)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -163,27 +163,3 @@
def _path_to_wdiff(self):
return 'wdiff'
-
- def _shut_down_http_server(self, server_pid):
- """Shut down the lighttpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # server_pid is not set when "http_server.py stop" is run manually.
- if server_pid is None:
- # TODO(mmoss) This isn't ideal, since it could conflict with
- # lighttpd processes not started by http_server.py,
- # but good enough for now.
- self._executive.kill_all('lighttpd')
- self._executive.kill_all('httpd')
- else:
- try:
- os.kill(server_pid, signal.SIGTERM)
- # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
- except OSError:
- # Sometimes we get a bad PID (e.g. from a stale httpd.pid
- # file), so if kill fails on the given PID, just try to
- # 'killall' web servers.
- self._shut_down_http_server(None)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -170,15 +170,3 @@
def _path_to_wdiff(self):
return self.path_from_chromium_base('third_party', 'cygwin', 'bin',
'wdiff.exe')
-
- def _shut_down_http_server(self, server_pid):
- """Shut down the lighttpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # FIXME: Why are we ignoring server_pid and calling
- # _kill_all instead of Executive.kill_process(pid)?
- self._executive.kill_all("LightTPD.exe")
- self._executive.kill_all("httpd.exe")
Property changes on: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py
___________________________________________________________________
Added: svn:executable
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -29,8 +29,6 @@
"""WebKit Gtk implementation of the Port interface."""
import logging
-import os
-import signal
from webkitpy.layout_tests.port.webkit import WebKitPort
@@ -49,29 +47,6 @@
return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
'apache2-debian-httpd.conf')
- def _shut_down_http_server(self, server_pid):
- """Shut down the httpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # server_pid is not set when "http_server.py stop" is run manually.
- if server_pid is None:
- # FIXME: This isn't ideal, since it could conflict with
- # lighttpd processes not started by http_server.py,
- # but good enough for now.
- self._executive.kill_all('apache2')
- else:
- try:
- os.kill(server_pid, signal.SIGTERM)
- # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
- except OSError:
- # Sometimes we get a bad PID (e.g. from a stale httpd.pid
- # file), so if kill fails on the given PID, just try to
- # 'killall' web servers.
- self._shut_down_http_server(None)
-
def _path_to_driver(self):
return self._build_path('Programs', 'DumpRenderTree')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -29,9 +29,7 @@
"""WebKit Mac implementation of the Port interface."""
import logging
-import os
import platform
-import signal
from webkitpy.layout_tests.port.webkit import WebKitPort
@@ -129,27 +127,3 @@
def _path_to_webcore_library(self):
return self._build_path('WebCore.framework/Versions/A/WebCore')
-
- # FIXME: This doesn't have anything to do with WebKit.
- def _shut_down_http_server(self, server_pid):
- """Shut down the lighttpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # server_pid is not set when "http_server.py stop" is run manually.
- if server_pid is None:
- # FIXME: This isn't ideal, since it could conflict with
- # lighttpd processes not started by http_server.py,
- # but good enough for now.
- self._executive.kill_all('httpd')
- else:
- try:
- os.kill(server_pid, signal.SIGTERM)
- # FIXME: Maybe throw in a SIGKILL just to be sure?
- except OSError:
- # Sometimes we get a bad PID (e.g. from a stale httpd.pid
- # file), so if kill fails on the given PID, just try to
- # 'killall' web servers.
- self._shut_down_http_server(None)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -29,8 +29,6 @@
"""QtWebKit implementation of the Port interface."""
import logging
-import os
-import signal
import sys
import webkit
@@ -63,29 +61,6 @@
return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
'apache2-debian-httpd.conf')
- def _shut_down_http_server(self, server_pid):
- """Shut down the httpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # server_pid is not set when "http_server.py stop" is run manually.
- if server_pid is None:
- # FIXME: This isn't ideal, since it could conflict with
- # lighttpd processes not started by http_server.py,
- # but good enough for now.
- self._executive.kill_all('apache2')
- else:
- try:
- os.kill(server_pid, signal.SIGTERM)
- # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
- except OSError:
- # Sometimes we get a bad PID (e.g. from a stale httpd.pid
- # file), so if kill fails on the given PID, just try to
- # 'killall' web servers.
- self._shut_down_http_server(None)
-
def _build_driver(self):
# The Qt port builds DRT as part of the main build step
return True
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py (89511 => 89512)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-06-23 01:15:41 UTC (rev 89511)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py 2011-06-23 01:17:31 UTC (rev 89512)
@@ -52,14 +52,3 @@
def _path_to_apache_config_file(self):
return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
'cygwin-httpd.conf')
-
- def _shut_down_http_server(self, server_pid):
- """Shut down the httpd web server. Blocks until it's fully
- shut down.
-
- Args:
- server_pid: The process ID of the running server.
- """
- # Looks like we ignore server_pid.
- # Copy/pasted from chromium-win.
- self._executive.kill_all("httpd.exe")
