2011-06-27 Adam Barth <abarth@webkit.org>
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Jun 2011 07:59:06 +0000 (07:59 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Jun 2011 07:59:06 +0000 (07:59 +0000)
        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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@89798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/new-run-webkit-httpd
Tools/Scripts/new-run-webkit-websocketserver
Tools/Scripts/webkitpy/layout_tests/port/base.py
Tools/Scripts/webkitpy/layout_tests/port/chromium.py
Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server.py [moved from Tools/Scripts/webkitpy/layout_tests/port/http_server.py with 98% similarity]
Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py [moved from Tools/Scripts/webkitpy/layout_tests/port/http_server_base.py with 99% similarity]
Tools/Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/http_server_integrationtest.py with 100% similarity]
Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py [moved from Tools/Scripts/webkitpy/layout_tests/port/websocket_server.py with 97% similarity]

index 0a2b2aa..4f52d08 100644 (file)
@@ -1,3 +1,27 @@
+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>
 
         Reviewed by Adam Barth.
index cf9b73b..69c521f 100755 (executable)
@@ -42,12 +42,13 @@ import os
 import sys
 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")
 sys.path.append(os.path.join(webkitpy_directory, "layout_tests"))
 
 import port
-from port import http_server
+from servers import http_server
 
 def run(options):
     if not options.server:
index ee40a84..8e88af3 100755 (executable)
@@ -35,7 +35,7 @@ import optparse
 import tempfile
 
 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
 
 
 def main():
index 1fc5972..4541ec2 100755 (executable)
@@ -57,10 +57,10 @@ from webkitpy.common.system.user import User
 from webkitpy.layout_tests import read_checksum_from_png
 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__)
 
index 9942090..bd2db5f 100644 (file)
@@ -47,8 +47,8 @@ from webkitpy.common.system.zipfileset import ZipFileSet
 from webkitpy.layout_tests.layout_package import test_expectations
 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")
 
index 2819f05..5d5c3d4 100755 (executable)
@@ -41,7 +41,7 @@ try:
 except ImportError:
     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
 mock_options = mocktool.MockOptions(configuration='Release')
index fd04ad0..44ea1a9 100644 (file)
@@ -35,7 +35,7 @@ import os
 import re
 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")
 
@@ -34,9 +34,9 @@ import os
 import sys
 import time
 
-from webkitpy.layout_tests.port import http_server_base
+from webkitpy.layout_tests.servers import http_server_base
 
-_log = logging.getLogger("webkitpy.layout_tests.port.http_server")
+_log = logging.getLogger("webkitpy.layout_tests.servers.http_server")
 
 class Lighttpd(http_server_base.HttpServerBase):
 
@@ -36,7 +36,7 @@ import sys
 import tempfile
 import time
 
-_log = logging.getLogger("webkitpy.layout_tests.port.http_server_base")
+_log = logging.getLogger("webkitpy.layout_tests.servers.http_server_base")
 
 
 class ServerError(Exception):
@@ -34,10 +34,10 @@ import os
 import sys
 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-'
 _WSS_LOG_PREFIX = 'pywebsocket.wss.log-'