Move webkitpy.layout_tests.port to webkitpy.port
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2013 08:36:06 +0000 (08:36 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Apr 2013 08:36:06 +0000 (08:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114668

Reviewed by Maciej Stachowiak.

Moved. Port objects knows a lot more than just layout_tests. They doesn't belong down in layout_tests.

* Scripts/webkitpy/common/host.py:
* Scripts/webkitpy/common/host_mock.py:
* Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
* Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py:
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
* Scripts/webkitpy/layout_tests/lint_test_expectations.py:
* Scripts/webkitpy/layout_tests/port: Removed.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
* Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
* Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py:
* Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
* Scripts/webkitpy/performance_tests/perftest.py:
* Scripts/webkitpy/performance_tests/perftest_unittest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
* Scripts/webkitpy/port: Copied from Tools/Scripts/webkitpy/layout_tests/port.
* Scripts/webkitpy/port/apple.py:
* Scripts/webkitpy/port/base.py:
* Scripts/webkitpy/port/base_unittest.py:
* Scripts/webkitpy/port/config_unittest.py:
(ConfigTest.test_default_configuration__standalone):
* Scripts/webkitpy/port/driver_unittest.py:
* Scripts/webkitpy/port/efl.py:
* Scripts/webkitpy/port/efl_unittest.py:
* Scripts/webkitpy/port/factory.py:
* Scripts/webkitpy/port/factory_unittest.py:
* Scripts/webkitpy/port/gtk.py:
* Scripts/webkitpy/port/gtk_unittest.py:
* Scripts/webkitpy/port/image_diff.py:
* Scripts/webkitpy/port/image_diff_unittest.py:
* Scripts/webkitpy/port/leakdetector_unittest.py:
* Scripts/webkitpy/port/mac.py:
* Scripts/webkitpy/port/mac_unittest.py:
* Scripts/webkitpy/port/mock_drt.py:
* Scripts/webkitpy/port/mock_drt_unittest.py:
* Scripts/webkitpy/port/port_testcase.py:
* Scripts/webkitpy/port/qt.py:
* Scripts/webkitpy/port/qt_unittest.py:
* Scripts/webkitpy/port/server_process_unittest.py:
* Scripts/webkitpy/port/test.py:
* Scripts/webkitpy/port/win.py:
* Scripts/webkitpy/port/win_unittest.py:
* Scripts/webkitpy/port/xvfbdriver.py:
* Scripts/webkitpy/port/xvfbdriver_unittest.py:
* Scripts/webkitpy/tool/bot/botinfo_unittest.py:
* Scripts/webkitpy/tool/commands/gardenomatic.py:
* Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
* Scripts/webkitpy/tool/commands/queries.py:
* Scripts/webkitpy/tool/commands/queries_unittest.py:
* Scripts/webkitpy/tool/commands/rebaseline.py:
* Scripts/webkitpy/tool/servers/gardeningserver.py:
* Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
* Scripts/webkitpy/tool/servers/rebaselineserver.py:
* Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:

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

68 files changed:
Tools/ChangeLog
Tools/Scripts/webkitpy/common/host.py
Tools/Scripts/webkitpy/common/host_mock.py
Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py
Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
Tools/Scripts/webkitpy/performance_tests/perftest.py
Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py
Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
Tools/Scripts/webkitpy/port/__init__.py [moved from Tools/Scripts/webkitpy/layout_tests/port/__init__.py with 100% similarity]
Tools/Scripts/webkitpy/port/apple.py [moved from Tools/Scripts/webkitpy/layout_tests/port/apple.py with 99% similarity]
Tools/Scripts/webkitpy/port/base.py [moved from Tools/Scripts/webkitpy/layout_tests/port/base.py with 99% similarity]
Tools/Scripts/webkitpy/port/base_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py with 99% similarity]
Tools/Scripts/webkitpy/port/builders.py [moved from Tools/Scripts/webkitpy/layout_tests/port/builders.py with 100% similarity]
Tools/Scripts/webkitpy/port/builders_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/builders_unittest.py with 100% similarity]
Tools/Scripts/webkitpy/port/config.py [moved from Tools/Scripts/webkitpy/layout_tests/port/config.py with 100% similarity]
Tools/Scripts/webkitpy/port/config_standalone.py [moved from Tools/Scripts/webkitpy/layout_tests/port/config_standalone.py with 100% similarity]
Tools/Scripts/webkitpy/port/config_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py with 99% similarity]
Tools/Scripts/webkitpy/port/driver.py [moved from Tools/Scripts/webkitpy/layout_tests/port/driver.py with 100% similarity]
Tools/Scripts/webkitpy/port/driver_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py with 98% similarity]
Tools/Scripts/webkitpy/port/efl.py [moved from Tools/Scripts/webkitpy/layout_tests/port/efl.py with 96% similarity]
Tools/Scripts/webkitpy/port/efl_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py with 92% similarity]
Tools/Scripts/webkitpy/port/factory.py [moved from Tools/Scripts/webkitpy/layout_tests/port/factory.py with 99% similarity]
Tools/Scripts/webkitpy/port/factory_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py with 93% similarity]
Tools/Scripts/webkitpy/port/gtk.py [moved from Tools/Scripts/webkitpy/layout_tests/port/gtk.py with 97% similarity]
Tools/Scripts/webkitpy/port/gtk_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py with 96% similarity]
Tools/Scripts/webkitpy/port/http_lock.py [moved from Tools/Scripts/webkitpy/layout_tests/port/http_lock.py with 100% similarity]
Tools/Scripts/webkitpy/port/http_lock_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/http_lock_unittest.py with 100% similarity]
Tools/Scripts/webkitpy/port/image_diff.py [moved from Tools/Scripts/webkitpy/layout_tests/port/image_diff.py with 98% similarity]
Tools/Scripts/webkitpy/port/image_diff_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py with 94% similarity]
Tools/Scripts/webkitpy/port/leakdetector.py [moved from Tools/Scripts/webkitpy/layout_tests/port/leakdetector.py with 100% similarity]
Tools/Scripts/webkitpy/port/leakdetector_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py with 99% similarity]
Tools/Scripts/webkitpy/port/mac.py [moved from Tools/Scripts/webkitpy/layout_tests/port/mac.py with 99% similarity]
Tools/Scripts/webkitpy/port/mac_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py with 99% similarity]
Tools/Scripts/webkitpy/port/mock_drt.py [moved from Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py with 98% similarity]
Tools/Scripts/webkitpy/port/mock_drt_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py with 98% similarity]
Tools/Scripts/webkitpy/port/port_testcase.py [moved from Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py with 99% similarity]
Tools/Scripts/webkitpy/port/pulseaudio_sanitizer.py [moved from Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer.py with 100% similarity]
Tools/Scripts/webkitpy/port/pulseaudio_sanitizer_mock.py [moved from Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py with 100% similarity]
Tools/Scripts/webkitpy/port/qt.py [moved from Tools/Scripts/webkitpy/layout_tests/port/qt.py with 98% similarity]
Tools/Scripts/webkitpy/port/qt_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py with 98% similarity]
Tools/Scripts/webkitpy/port/server_process.py [moved from Tools/Scripts/webkitpy/layout_tests/port/server_process.py with 100% similarity]
Tools/Scripts/webkitpy/port/server_process_mock.py [moved from Tools/Scripts/webkitpy/layout_tests/port/server_process_mock.py with 100% similarity]
Tools/Scripts/webkitpy/port/server_process_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/server_process_unittest.py with 97% similarity]
Tools/Scripts/webkitpy/port/test.py [moved from Tools/Scripts/webkitpy/layout_tests/port/test.py with 99% similarity]
Tools/Scripts/webkitpy/port/win.py [moved from Tools/Scripts/webkitpy/layout_tests/port/win.py with 98% similarity]
Tools/Scripts/webkitpy/port/win_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py with 98% similarity]
Tools/Scripts/webkitpy/port/xvfbdriver.py [moved from Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py with 97% similarity]
Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py [moved from Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py with 97% similarity]
Tools/Scripts/webkitpy/tool/bot/botinfo_unittest.py
Tools/Scripts/webkitpy/tool/commands/gardenomatic.py
Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py
Tools/Scripts/webkitpy/tool/commands/queries.py
Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
Tools/Scripts/webkitpy/tool/commands/rebaseline.py
Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py

index c350a01..abdbc01 100644 (file)
@@ -1,3 +1,70 @@
+2013-04-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Move webkitpy.layout_tests.port to webkitpy.port
+        https://bugs.webkit.org/show_bug.cgi?id=114668
+
+        Reviewed by Maciej Stachowiak.
+
+        Moved. Port objects knows a lot more than just layout_tests. They doesn't belong down in layout_tests.
+
+        * Scripts/webkitpy/common/host.py:
+        * Scripts/webkitpy/common/host_mock.py:
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
+        * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+        * Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py:
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
+        * Scripts/webkitpy/layout_tests/lint_test_expectations.py:
+        * Scripts/webkitpy/layout_tests/port: Removed.
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        * Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
+        * Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py:
+        * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
+        * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+        * Scripts/webkitpy/performance_tests/perftest.py:
+        * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+        * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        * Scripts/webkitpy/port: Copied from Tools/Scripts/webkitpy/layout_tests/port.
+        * Scripts/webkitpy/port/apple.py:
+        * Scripts/webkitpy/port/base.py:
+        * Scripts/webkitpy/port/base_unittest.py:
+        * Scripts/webkitpy/port/config_unittest.py:
+        (ConfigTest.test_default_configuration__standalone):
+        * Scripts/webkitpy/port/driver_unittest.py:
+        * Scripts/webkitpy/port/efl.py:
+        * Scripts/webkitpy/port/efl_unittest.py:
+        * Scripts/webkitpy/port/factory.py:
+        * Scripts/webkitpy/port/factory_unittest.py:
+        * Scripts/webkitpy/port/gtk.py:
+        * Scripts/webkitpy/port/gtk_unittest.py:
+        * Scripts/webkitpy/port/image_diff.py:
+        * Scripts/webkitpy/port/image_diff_unittest.py:
+        * Scripts/webkitpy/port/leakdetector_unittest.py:
+        * Scripts/webkitpy/port/mac.py:
+        * Scripts/webkitpy/port/mac_unittest.py:
+        * Scripts/webkitpy/port/mock_drt.py:
+        * Scripts/webkitpy/port/mock_drt_unittest.py:
+        * Scripts/webkitpy/port/port_testcase.py:
+        * Scripts/webkitpy/port/qt.py:
+        * Scripts/webkitpy/port/qt_unittest.py:
+        * Scripts/webkitpy/port/server_process_unittest.py:
+        * Scripts/webkitpy/port/test.py:
+        * Scripts/webkitpy/port/win.py:
+        * Scripts/webkitpy/port/win_unittest.py:
+        * Scripts/webkitpy/port/xvfbdriver.py:
+        * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+        * Scripts/webkitpy/tool/bot/botinfo_unittest.py:
+        * Scripts/webkitpy/tool/commands/gardenomatic.py:
+        * Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/commands/queries_unittest.py:
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+        * Scripts/webkitpy/tool/servers/rebaselineserver.py:
+        * Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
+
 2013-04-16  Commit Queue  <rniwa@webkit.org>
 
         Unreviewed, rolling out r148498.
index ef4b7ef..022c13b 100644 (file)
@@ -37,7 +37,7 @@ from webkitpy.common.memoized import memoized
 from webkitpy.common.net import bugzilla, buildbot, web
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.watchlist.watchlistparser import WatchListParser
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port.factory import PortFactory
 
 
 _log = logging.getLogger(__name__)
index 8ac2dd3..be23846 100644 (file)
@@ -35,8 +35,8 @@ from webkitpy.common.system.systemhost_mock import MockSystemHost
 from webkitpy.common.watchlist.watchlist_mock import MockWatchList
 
 # New-style ports need to move down into webkitpy.common.
-from webkitpy.layout_tests.port.factory import PortFactory
-from webkitpy.layout_tests.port.test import add_unit_tests_to_mock_filesystem
+from webkitpy.port.factory import PortFactory
+from webkitpy.port.test import add_unit_tests_to_mock_filesystem
 
 
 class MockHost(MockSystemHost):
index 362747d..5613c82 100644 (file)
@@ -38,7 +38,7 @@ from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_run_results import TestRunResults
 from webkitpy.layout_tests.models.test_input import TestInput
 from webkitpy.layout_tests.models.test_results import TestResult
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 
 
 TestExpectations = test_expectations.TestExpectations
index b794d31..53f25ce 100644 (file)
@@ -32,7 +32,7 @@ import re
 import time
 
 from webkitpy.layout_tests.controllers import test_result_writer
-from webkitpy.layout_tests.port.driver import DriverInput, DriverOutput
+from webkitpy.port.driver import DriverInput, DriverOutput
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_results import TestResult
index 313e8f0..f484da5 100644 (file)
@@ -28,8 +28,8 @@ import unittest2 as unittest
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.controllers import test_result_writer
 from webkitpy.layout_tests.models import test_failures
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestPort
 
 
 class TestResultWriterTest(unittest.TestCase):
index 1427002..c952e33 100644 (file)
@@ -34,7 +34,7 @@ import random
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.layout_tests.models import test_expectations
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.thirdparty.mock import Mock
 
 
index 52aa7b9..90e4cbb 100644 (file)
@@ -33,7 +33,7 @@ import traceback
 
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.models import test_expectations
-from webkitpy.layout_tests.port import platform_options
+from webkitpy.port import platform_options
 
 
 # This mirrors what the shell normally does.
index b211b97..74cb69b 100644 (file)
@@ -37,7 +37,7 @@ import traceback
 
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.controllers.manager import Manager
-from webkitpy.layout_tests.port import configuration_options, platform_options
+from webkitpy.port import configuration_options, platform_options
 from webkitpy.layout_tests.views import buildbot_results
 from webkitpy.layout_tests.views import printing
 
index bd45ab3..74f1e29 100644 (file)
@@ -48,10 +48,10 @@ from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.host import Host
 from webkitpy.common.host_mock import MockHost
 
-from webkitpy.layout_tests import port
+from webkitpy import port
 from webkitpy.layout_tests import run_webkit_tests
-from webkitpy.layout_tests.port import Port
-from webkitpy.layout_tests.port import test
+from webkitpy.port import Port
+from webkitpy.port import test
 from webkitpy.test.skip import skip_if
 from webkitpy.tool.mocktool import MockOptions
 
index 5ca027f..5b4ffa7 100644 (file)
@@ -33,7 +33,7 @@ import unittest2 as unittest
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.apache_http_server import LayoutTestApacheHttpd
 from webkitpy.layout_tests.servers.http_server_base import ServerError
 
index 410f6e4..2cf1d2c 100644 (file)
@@ -29,7 +29,7 @@
 import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.http_server_base import HttpServerBase
 
 
index 2ee9495..621838f 100644 (file)
@@ -31,7 +31,7 @@ import sys
 import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.http_server import Lighttpd
 from webkitpy.layout_tests.servers.http_server_base import ServerError
 
index 71e7888..d65cc5e 100644 (file)
@@ -37,7 +37,7 @@ import unittest2 as unittest
 from webkitpy.common.host_mock import MockHost
 
 from webkitpy.common.system import logtesting
-from webkitpy.layout_tests import port
+from webkitpy import port
 from webkitpy.layout_tests.controllers import manager
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
index 29a796f..2c365c3 100644 (file)
@@ -45,8 +45,8 @@ if sys.platform not in ('cygwin', 'win32'):
     import webkitpy.thirdparty.autoinstalled.webpagereplay.replay
 
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
-from webkitpy.layout_tests.port.driver import DriverInput
-from webkitpy.layout_tests.port.driver import DriverOutput
+from webkitpy.port.driver import DriverInput
+from webkitpy.port.driver import DriverOutput
 
 DEFAULT_TEST_RUNNER_COUNT = 4
 
index 8b299b8..010a300 100644 (file)
@@ -33,9 +33,9 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestDriver
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestDriver
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import ChromiumStylePerfTest
 from webkitpy.performance_tests.perftest import PerfTest
 from webkitpy.performance_tests.perftest import PerfTestMetric
index 8bc2148..3f9625d 100644 (file)
@@ -36,8 +36,8 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import ChromiumStylePerfTest
 from webkitpy.performance_tests.perftest import PerfTest
 from webkitpy.performance_tests.perftestsrunner import PerfTestsRunner
index 4e38f53..29bd7a8 100644 (file)
@@ -35,7 +35,7 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import DEFAULT_TEST_RUNNER_COUNT
 from webkitpy.performance_tests.perftestsrunner import PerfTestsRunner
 
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/apple.py
rename to Tools/Scripts/webkitpy/port/apple.py
index 9290bca..966d04a 100644 (file)
@@ -28,7 +28,7 @@
 
 import logging
 
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 
 
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/base.py
rename to Tools/Scripts/webkitpy/port/base.py
index 9ddbded..c6ec76f 100644 (file)
@@ -55,12 +55,12 @@ from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port import config as port_config
-from webkitpy.layout_tests.port import driver
-from webkitpy.layout_tests.port import http_lock
-from webkitpy.layout_tests.port import image_diff
-from webkitpy.layout_tests.port import server_process
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port import config as port_config
+from webkitpy.port import driver
+from webkitpy.port import http_lock
+from webkitpy.port import image_diff
+from webkitpy.port import server_process
+from webkitpy.port.factory import PortFactory
 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
@@ -68,7 +68,6 @@ from webkitpy.layout_tests.servers import websocket_server
 _log = logging.getLogger(__name__)
 
 
-# FIXME: This class should merge with WebKitPort now that Chromium behaves mostly like other webkit ports.
 class Port(object):
     """Abstract class for Port-specific hooks for the layout_test package."""
 
@@ -42,8 +42,8 @@ from webkitpy.tool.mocktool import MockOptions
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.test import add_unit_tests_to_mock_filesystem, TestPort
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
 
 class PortTest(unittest.TestCase):
     def make_port(self, executive=None, with_tests=False, port_name=None, **kwargs):
@@ -132,7 +132,7 @@ class ConfigTest(unittest.TestCase):
         e = Executive()
         fs = FileSystem()
         c = config.Config(e, fs)
-        script = WebKitFinder(fs).path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'layout_tests', 'port', 'config_standalone.py')
+        script = WebKitFinder(fs).path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'port', 'config_standalone.py')
 
         # Note: don't use 'Release' here, since that's the normal default.
         expected = 'Debug'
@@ -30,11 +30,11 @@ import unittest2 as unittest
 
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.server_process_mock import MockServerProcess
 
 # FIXME: remove the dependency on TestWebKitPort
-from webkitpy.layout_tests.port.port_testcase import TestWebKitPort
+from webkitpy.port.port_testcase import TestWebKitPort
 
 from webkitpy.tool.mocktool import MockOptions
 
similarity index 96%
rename from Tools/Scripts/webkitpy/layout_tests/port/efl.py
rename to Tools/Scripts/webkitpy/port/efl.py
index 0896634..01c66eb 100644 (file)
@@ -30,9 +30,9 @@
 import os
 
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 
 class EflPort(Port):
@@ -28,9 +28,9 @@ import unittest2 as unittest
 
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.efl import EflPort
-from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.efl import EflPort
+from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
+from webkitpy.port import port_testcase
 
 
 class EflPortTest(port_testcase.PortTestCase):
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/factory.py
rename to Tools/Scripts/webkitpy/port/factory.py
index 41944b2..e9f1465 100644 (file)
@@ -32,7 +32,7 @@ import fnmatch
 import optparse
 import re
 
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 
 
 def platform_options(use_globs=False):
@@ -31,12 +31,12 @@ import unittest2 as unittest
 from webkitpy.tool.mocktool import MockOptions
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import factory
-from webkitpy.layout_tests.port import gtk
-from webkitpy.layout_tests.port import mac
-from webkitpy.layout_tests.port import qt
-from webkitpy.layout_tests.port import test
-from webkitpy.layout_tests.port import win
+from webkitpy.port import factory
+from webkitpy.port import gtk
+from webkitpy.port import mac
+from webkitpy.port import qt
+from webkitpy.port import test
+from webkitpy.port import win
 
 
 class FactoryTest(unittest.TestCase):
similarity index 97%
rename from Tools/Scripts/webkitpy/layout_tests/port/gtk.py
rename to Tools/Scripts/webkitpy/port/gtk.py
index a023806..c94f036 100644 (file)
@@ -30,9 +30,9 @@ import os
 import subprocess
 
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 
 class GtkPort(Port):
@@ -33,9 +33,9 @@ import os
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.gtk import GtkPort
-from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.gtk import GtkPort
+from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
+from webkitpy.port import port_testcase
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.mocktool import MockOptions
 
@@ -34,7 +34,7 @@ import logging
 import re
 import time
 
-from webkitpy.layout_tests.port import server_process
+from webkitpy.port import server_process
 
 
 _log = logging.getLogger(__name__)
@@ -30,8 +30,8 @@
 
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
-from webkitpy.layout_tests.port.image_diff import ImageDiffer
+from webkitpy.port.server_process_mock import MockServerProcess
+from webkitpy.port.image_diff import ImageDiffer
 
 
 class FakePort(object):
@@ -28,7 +28,7 @@
 
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.leakdetector import LeakDetector
+from webkitpy.port.leakdetector import LeakDetector
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.executive_mock import MockExecutive
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/mac.py
rename to Tools/Scripts/webkitpy/port/mac.py
index d39ba35..d66e6d6 100644 (file)
@@ -33,8 +33,8 @@ import time
 
 from webkitpy.common.system.crashlogs import CrashLogs
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.layout_tests.port.apple import ApplePort
-from webkitpy.layout_tests.port.leakdetector import LeakDetector
+from webkitpy.port.apple import ApplePort
+from webkitpy.port.leakdetector import LeakDetector
 
 
 _log = logging.getLogger(__name__)
@@ -26,8 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from webkitpy.layout_tests.port.mac import MacPort
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.mac import MacPort
+from webkitpy.port import port_testcase
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.mocktool import MockOptions
@@ -49,8 +49,8 @@ if script_dir not in sys.path:
     sys.path.append(script_dir)
 
 from webkitpy.common.system.systemhost import SystemHost
-from webkitpy.layout_tests.port.driver import DriverInput, DriverOutput, DriverProxy
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port.driver import DriverInput, DriverOutput, DriverProxy
+from webkitpy.port.factory import PortFactory
 
 _log = logging.getLogger(__name__)
 
@@ -33,10 +33,10 @@ import unittest2 as unittest
 
 from webkitpy.common import newstringio
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import mock_drt
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port import test
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port import mock_drt
+from webkitpy.port import port_testcase
+from webkitpy.port import test
+from webkitpy.port.factory import PortFactory
 from webkitpy.tool import mocktool
 
 
@@ -40,8 +40,8 @@ from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
+from webkitpy.port.base import Port
+from webkitpy.port.server_process_mock import MockServerProcess
 from webkitpy.layout_tests.servers import http_server_base
 from webkitpy.tool.mocktool import MockOptions
 
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/qt.py
rename to Tools/Scripts/webkitpy/port/qt.py
index 4840725..5dda762 100644 (file)
@@ -36,8 +36,8 @@ import os
 
 from webkitpy.common.memoized import memoized
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 _log = logging.getLogger(__name__)
 
@@ -33,8 +33,8 @@ from copy import deepcopy
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port.qt import QtPort
+from webkitpy.port import port_testcase
+from webkitpy.port.qt import QtPort
 from webkitpy.tool.mocktool import MockOptions
 
 
@@ -30,8 +30,8 @@ import sys
 import time
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.factory import PortFactory
-from webkitpy.layout_tests.port import server_process
+from webkitpy.port.factory import PortFactory
+from webkitpy.port import server_process
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 from webkitpy.common.system.outputcapture import OutputCapture
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/test.py
rename to Tools/Scripts/webkitpy/port/test.py
index c622cc2..7ad318d 100644 (file)
@@ -30,8 +30,8 @@ import base64
 import sys
 import time
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.base import VirtualTestSuite
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.base import VirtualTestSuite
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.crashlogs import CrashLogs
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/win.py
rename to Tools/Scripts/webkitpy/port/win.py
index 6adbf75..2bb54fd 100644 (file)
@@ -33,7 +33,7 @@ import sys
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.system.executive import ScriptError, Executive
 from webkitpy.common.system.path import abspath_to_uri
-from webkitpy.layout_tests.port.apple import ApplePort
+from webkitpy.port.apple import ApplePort
 
 
 _log = logging.getLogger(__name__)
@@ -34,8 +34,8 @@ from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port.win import WinPort
+from webkitpy.port import port_testcase
+from webkitpy.port.win import WinPort
 from webkitpy.tool.mocktool import MockOptions
 
 
@@ -31,8 +31,8 @@ import os
 import re
 import time
 
-from webkitpy.layout_tests.port.server_process import ServerProcess
-from webkitpy.layout_tests.port.driver import Driver
+from webkitpy.port.server_process import ServerProcess
+from webkitpy.port.driver import Driver
 from webkitpy.common.system.file_lock import FileLock
 
 _log = logging.getLogger(__name__)
@@ -33,9 +33,9 @@ from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import Port
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port import Port
+from webkitpy.port.server_process_mock import MockServerProcess
+from webkitpy.port.xvfbdriver import XvfbDriver
 from webkitpy.tool.mocktool import MockOptions
 
 _log = logging.getLogger(__name__)
index 5589556..04861f4 100644 (file)
@@ -31,7 +31,7 @@ import unittest2 as unittest
 from webkitpy.tool.bot.botinfo import BotInfo
 from webkitpy.tool.mocktool import MockTool
 from webkitpy.common.net.statusserver_mock import MockStatusServer
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 
 
 class BotInfoTest(unittest.TestCase):
index c87c1a2..e976285 100644 (file)
@@ -22,7 +22,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 from webkitpy.tool.commands.rebaseline import AbstractRebaseliningCommand
 from webkitpy.tool.servers.gardeningserver import GardeningHTTPServer
 
index 14211e4..3efb461 100644 (file)
@@ -31,7 +31,7 @@ import unittest2 as unittest
 from webkitpy.common.net.buildbot import Builder
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.tool.commands.perfalizer import PerfalizerTask
 from webkitpy.tool.mocktool import MockTool
 
index cf1c47f..640f09d 100644 (file)
@@ -48,7 +48,7 @@ from webkitpy.tool.commands.abstractsequencedcommand import AbstractSequencedCom
 from webkitpy.tool.grammar import pluralize
 from webkitpy.tool.multicommandtool import Command
 from webkitpy.layout_tests.models.test_expectations import TestExpectations
-from webkitpy.layout_tests.port import platform_options, configuration_options
+from webkitpy.port import platform_options, configuration_options
 
 _log = logging.getLogger(__name__)
 
index b94b031..8800cac 100644 (file)
@@ -33,7 +33,7 @@ from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.net.bugzilla import Bugzilla
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.thirdparty.mock import Mock
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.tool.commands.commandtest import CommandsTest
 from webkitpy.tool.commands.queries import *
 from webkitpy.tool.mocktool import MockTool, MockOptions
index f15dc03..06d42d0 100644 (file)
@@ -36,8 +36,8 @@ from webkitpy.common.system.executive import ScriptError
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, BASELINE_SUFFIX_LIST
-from webkitpy.layout_tests.port import builders
-from webkitpy.layout_tests.port import factory
+from webkitpy.port import builders
+from webkitpy.port import factory
 from webkitpy.tool.multicommandtool import Command
 
 
index 6d29f44..b069846 100644 (file)
@@ -32,7 +32,7 @@ import urllib
 
 from webkitpy.common.memoized import memoized
 from webkitpy.tool.servers.reflectionhandler import ReflectionHandler
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 
 
 _log = logging.getLogger(__name__)
index 45bd4ee..9f9efe8 100644 (file)
@@ -32,7 +32,7 @@ import unittest2 as unittest
 
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.layout_tests.models.test_configuration import *
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.mocktool import MockTool
 from webkitpy.common.system.executive_mock import MockExecutive
index 04ce517..41a32ba 100644 (file)
@@ -33,7 +33,7 @@ import BaseHTTPServer
 
 from webkitpy.common.host import Host  # FIXME: This should not be needed!
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.tool.servers.reflectionhandler import ReflectionHandler
 
 
index fd19c4d..721154c 100644 (file)
@@ -32,7 +32,7 @@ import unittest2 as unittest
 from webkitpy.common.net import resultsjsonparser_unittest
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.layout_package.json_results_generator import strip_json_wrapper
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.tool.commands.rebaselineserver import TestConfig, RebaselineServer
 from webkitpy.tool.servers import rebaselineserver