Changeset 89512 in webkit


Ignore:
Timestamp:
Jun 22, 2011 6:17:31 PM (13 years ago)
Author:
dpranke@chromium.org
Message:

2011-06-22 Dirk Pranke <​dpranke@chromium.org>

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:
Location:
trunk/Tools
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r89510 r89512  
     12011-06-22  Dirk Pranke  <dpranke@chromium.org>
     2
     3        Reviewed by Ojan Vafai.
     4
     5        new-run-webkit-tests: remove obsolete port.shut_down_http_server method
     6        https://bugs.webkit.org/show_bug.cgi?id=59993
     7
     8        * Scripts/webkitpy/layout_tests/port/base.py:
     9        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
     10        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
     11        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
     12        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
     13        * Scripts/webkitpy/layout_tests/port/gtk.py:
     14        * Scripts/webkitpy/layout_tests/port/mac.py:
     15        * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
     16        * Scripts/webkitpy/layout_tests/port/qt.py:
     17        * Scripts/webkitpy/layout_tests/port/win.py:
     18
    1192011-06-22  Luke Macpherson   <macpherson@chromium.org>
    220

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

    r89502 r89512  
    913913        raise NotImplementedError('Port._path_to_wdiff')
    914914
    915     def _shut_down_http_server(self, pid):
    916         """Forcefully and synchronously kills the web server.
    917 
    918         This routine should only be called from http_server.py or its
    919         subclasses."""
    920         raise NotImplementedError('Port._shut_down_http_server')
    921 
    922915    def _webkit_baseline_path(self, platform):
    923916        """Return the  full path to the top of the baseline tree for a

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py

    r85735 r89512  
    289289        self.assertVirtual(port._path_to_lighttpd_php)
    290290        self.assertVirtual(port._path_to_wdiff)
    291         self.assertVirtual(port._shut_down_http_server, None)
    292291
    293292    def test_virtual_driver_method(self):

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py

    r86696 r89512  
    3131
    3232import logging
    33 import os
    34 import signal
    3533
    3634import chromium
    … …  
    205203    def _is_redhat_based(self):
    206204        return self._filesystem.exists(self._filesystem.join('/etc', 'redhat-release'))
    207 
    208     def _shut_down_http_server(self, server_pid):
    209         """Shut down the lighttpd web server. Blocks until it's fully
    210         shut down.
    211 
    212         Args:
    213             server_pid: The process ID of the running server.
    214         """
    215         # server_pid is not set when "http_server.py stop" is run manually.
    216         if server_pid is None:
    217             # TODO(mmoss) This isn't ideal, since it could conflict with
    218             # lighttpd processes not started by http_server.py,
    219             # but good enough for now.
    220             self._executive.kill_all("lighttpd")
    221             self._executive.kill_all("apache2")
    222         else:
    223             try:
    224                 os.kill(server_pid, signal.SIGTERM)
    225                 # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
    226             except OSError:
    227                 # Sometimes we get a bad PID (e.g. from a stale httpd.pid
    228                 # file), so if kill fails on the given PID, just try to
    229                 # 'killall' web servers.
    230                 self._shut_down_http_server(None)

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py

    r85735 r89512  
    164164    def _path_to_wdiff(self):
    165165        return 'wdiff'
    166 
    167     def _shut_down_http_server(self, server_pid):
    168         """Shut down the lighttpd web server. Blocks until it's fully
    169         shut down.
    170 
    171         Args:
    172             server_pid: The process ID of the running server.
    173         """
    174         # server_pid is not set when "http_server.py stop" is run manually.
    175         if server_pid is None:
    176             # TODO(mmoss) This isn't ideal, since it could conflict with
    177             # lighttpd processes not started by http_server.py,
    178             # but good enough for now.
    179             self._executive.kill_all('lighttpd')
    180             self._executive.kill_all('httpd')
    181         else:
    182             try:
    183                 os.kill(server_pid, signal.SIGTERM)
    184                 # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
    185             except OSError:
    186                 # Sometimes we get a bad PID (e.g. from a stale httpd.pid
    187                 # file), so if kill fails on the given PID, just try to
    188                 # 'killall' web servers.
    189                 self._shut_down_http_server(None)

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py

    • Property svn:executable set to *
    r85896 r89512  
    171171        return self.path_from_chromium_base('third_party', 'cygwin', 'bin',
    172172                                            'wdiff.exe')
    173 
    174     def _shut_down_http_server(self, server_pid):
    175         """Shut down the lighttpd web server. Blocks until it's fully
    176         shut down.
    177 
    178         Args:
    179             server_pid: The process ID of the running server.
    180         """
    181         # FIXME: Why are we ignoring server_pid and calling
    182         # _kill_all instead of Executive.kill_process(pid)?
    183         self._executive.kill_all("LightTPD.exe")
    184         self._executive.kill_all("httpd.exe")

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py

    r88177 r89512  
    3030
    3131import logging
    32 import os
    33 import signal
    3432
    3533from webkitpy.layout_tests.port.webkit import WebKitPort
    … …  
    4947        return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
    5048                                     'apache2-debian-httpd.conf')
    51 
    52     def _shut_down_http_server(self, server_pid):
    53         """Shut down the httpd web server. Blocks until it's fully
    54         shut down.
    55 
    56         Args:
    57             server_pid: The process ID of the running server.
    58         """
    59         # server_pid is not set when "http_server.py stop" is run manually.
    60         if server_pid is None:
    61             # FIXME: This isn't ideal, since it could conflict with
    62             # lighttpd processes not started by http_server.py,
    63             # but good enough for now.
    64             self._executive.kill_all('apache2')
    65         else:
    66             try:
    67                 os.kill(server_pid, signal.SIGTERM)
    68                 # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
    69             except OSError:
    70                 # Sometimes we get a bad PID (e.g. from a stale httpd.pid
    71                 # file), so if kill fails on the given PID, just try to
    72                 # 'killall' web servers.
    73                 self._shut_down_http_server(None)
    7449
    7550    def _path_to_driver(self):

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py

    r85735 r89512  
    3030
    3131import logging
    32 import os
    3332import platform
    34 import signal
    3533
    3634from webkitpy.layout_tests.port.webkit import WebKitPort
    … …  
    130128    def _path_to_webcore_library(self):
    131129        return self._build_path('WebCore.framework/Versions/A/WebCore')
    132 
    133     # FIXME: This doesn't have anything to do with WebKit.
    134     def _shut_down_http_server(self, server_pid):
    135         """Shut down the lighttpd web server. Blocks until it's fully
    136         shut down.
    137 
    138         Args:
    139             server_pid: The process ID of the running server.
    140         """
    141         # server_pid is not set when "http_server.py stop" is run manually.
    142         if server_pid is None:
    143             # FIXME: This isn't ideal, since it could conflict with
    144             # lighttpd processes not started by http_server.py,
    145             # but good enough for now.
    146             self._executive.kill_all('httpd')
    147         else:
    148             try:
    149                 os.kill(server_pid, signal.SIGTERM)
    150                 # FIXME: Maybe throw in a SIGKILL just to be sure?
    151             except OSError:
    152                 # Sometimes we get a bad PID (e.g. from a stale httpd.pid
    153                 # file), so if kill fails on the given PID, just try to
    154                 # 'killall' web servers.
    155                 self._shut_down_http_server(None)

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py

    r89031 r89512  
    3030
    3131import logging
    32 import os
    33 import signal
    3432import sys
    3533
    … …  
    6462                                     'apache2-debian-httpd.conf')
    6563
    66     def _shut_down_http_server(self, server_pid):
    67         """Shut down the httpd web server. Blocks until it's fully
    68         shut down.
    69 
    70         Args:
    71             server_pid: The process ID of the running server.
    72         """
    73         # server_pid is not set when "http_server.py stop" is run manually.
    74         if server_pid is None:
    75             # FIXME: This isn't ideal, since it could conflict with
    76             # lighttpd processes not started by http_server.py,
    77             # but good enough for now.
    78             self._executive.kill_all('apache2')
    79         else:
    80             try:
    81                 os.kill(server_pid, signal.SIGTERM)
    82                 # TODO(mmoss) Maybe throw in a SIGKILL just to be sure?
    83             except OSError:
    84                 # Sometimes we get a bad PID (e.g. from a stale httpd.pid
    85                 # file), so if kill fails on the given PID, just try to
    86                 # 'killall' web servers.
    87                 self._shut_down_http_server(None)
    88 
    8964    def _build_driver(self):
    9065        # The Qt port builds DRT as part of the main build step

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py

    r86429 r89512  
    5353        return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf',
    5454                                     'cygwin-httpd.conf')
    55 
    56     def _shut_down_http_server(self, server_pid):
    57         """Shut down the httpd web server. Blocks until it's fully
    58         shut down.
    59 
    60         Args:
    61             server_pid: The process ID of the running server.
    62         """
    63         # Looks like we ignore server_pid.
    64         # Copy/pasted from chromium-win.
    65         self._executive.kill_all("httpd.exe")
Note: See TracChangeset for help on using the changeset viewer.