Changeset 89798 in webkit

Timestamp:

Jun 27, 2011 12:59:06 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-27 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Move websocket_server and http_server to webkitpy.layout_package.servers
​https://bugs.webkit.org/show_bug.cgi?id=63434

These classes do not represent ports. They represent servers.

• Scripts/new-run-webkit-httpd:
• Scripts/new-run-webkit-websocketserver:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/http_server.py: Removed.
• Scripts/webkitpy/layout_tests/port/http_server_base.py: Removed.
• Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py: Removed.
• Scripts/webkitpy/layout_tests/port/port_testcase.py:
• Scripts/webkitpy/layout_tests/port/websocket_server.py: Removed.
• Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
• Scripts/webkitpy/layout_tests/servers/http_server.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server.py.
• Scripts/webkitpy/layout_tests/servers/http_server_base.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py.
• Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py.
• Scripts/webkitpy/layout_tests/servers/websocket_server.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-httpd (modified) (2 diffs)
• Scripts/new-run-webkit-websocketserver (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/servers/apache_http_server.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/servers/http_server.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/port/http_server.py) (1 diff)
• Scripts/webkitpy/layout_tests/servers/http_server_base.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py) (1 diff)
• Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py)
• Scripts/webkitpy/layout_tests/servers/websocket_server.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move websocket_server and http_server to webkitpy.layout_package.servers
+        https://bugs.webkit.org/show_bug.cgi?id=63434
+
+        These classes do not represent ports.  They represent servers.
+
+        * Scripts/new-run-webkit-httpd:
+        * Scripts/new-run-webkit-websocketserver:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/http_server.py: Removed.
+        * Scripts/webkitpy/layout_tests/port/http_server_base.py: Removed.
+        * Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py: Removed.
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py: Removed.
+        * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+        * Scripts/webkitpy/layout_tests/servers/http_server.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server.py.
+        * Scripts/webkitpy/layout_tests/servers/http_server_base.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py.
+        * Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py.
+        * Scripts/webkitpy/layout_tests/servers/websocket_server.py: Copied from Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py.
+
 2011-06-27  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/new-run-webkit-httpd

@@ -43 +43 @@
 import tempfile
 
+# FIXME: We should not be hacking around in sys.path.
 scripts_directory = os.path.dirname(os.path.abspath(sys.argv[0]))
 webkitpy_directory = os.path.join(scripts_directory, "webkitpy")
@@ -48 +49 @@
 
 import port
-from port import http_server
+from servers import http_server
 
 def run(options):

trunk/Tools/Scripts/new-run-webkit-websocketserver

@@ -36 +36 @@
 
 import webkitpy.layout_tests.port.factory as factory
-import webkitpy.layout_tests.port.websocket_server as websocket_server
+import webkitpy.layout_tests.servers.websocket_server as websocket_server
 
 

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

@@ -58 +58 @@
 from webkitpy.layout_tests.port import config as port_config
 from webkitpy.layout_tests.port import http_lock
-from webkitpy.layout_tests.port import http_server
 from webkitpy.layout_tests.port import test_files
-from webkitpy.layout_tests.port import websocket_server
 from webkitpy.layout_tests.servers import apache_http_server
+from webkitpy.layout_tests.servers import http_server
+from webkitpy.layout_tests.servers import websocket_server
 
 _log = logutils.get_logger(__file__)

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -48 +48 @@
 from webkitpy.layout_tests.port import base
 from webkitpy.layout_tests.port import builders
-from webkitpy.layout_tests.port import http_server
-from webkitpy.layout_tests.port import websocket_server
+from webkitpy.layout_tests.servers import http_server
+from webkitpy.layout_tests.servers import websocket_server
 
 _log = logging.getLogger("webkitpy.layout_tests.port.chromium")

trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -42 +42 @@
     multiprocessing = None
 
-from webkitpy.layout_tests.port import http_server_base
+from webkitpy.layout_tests.servers import http_server_base
 
 from webkitpy.tool import mocktool

trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py

@@ -36 +36 @@
 import sys
 
-from webkitpy.layout_tests.port import http_server_base
+from webkitpy.layout_tests.servers import http_server_base
 
 _log = logging.getLogger("webkitpy.layout_tests.servers.apache_http_server")

trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py

@@ -35 +35 @@
 import time
 
-from webkitpy.layout_tests.port import http_server_base
-
-_log = logging.getLogger("webkitpy.layout_tests.port.http_server")
+from webkitpy.layout_tests.servers import http_server_base
+
+_log = logging.getLogger("webkitpy.layout_tests.servers.http_server")
 
 class Lighttpd(http_server_base.HttpServerBase):

trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py

@@ -37 +37 @@
 import time
 
-_log = logging.getLogger("webkitpy.layout_tests.port.http_server_base")
+_log = logging.getLogger("webkitpy.layout_tests.servers.http_server_base")
 
 

trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py

@@ -35 +35 @@
 import time
 
-from webkitpy.layout_tests.port import http_server
-from webkitpy.layout_tests.port import http_server_base
+from webkitpy.layout_tests.servers import http_server
+from webkitpy.layout_tests.servers import http_server_base
 
-_log = logging.getLogger("webkitpy.layout_tests.port.websocket_server")
+_log = logging.getLogger("webkitpy.layout_tests.servers.websocket_server")
 
 _WS_LOG_PREFIX = 'pywebsocket.ws.log-'