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
+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.
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__)
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):
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
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
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):
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
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.
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
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
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
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
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
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
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
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
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
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
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
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
_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."""
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):
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'
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
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):
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):
import optparse
import re
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
def platform_options(use_globs=False):
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):
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):
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
import re
import time
-from webkitpy.layout_tests.port import server_process
+from webkitpy.port import server_process
_log = logging.getLogger(__name__)
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):
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
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__)
# (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
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__)
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
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
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__)
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
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
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
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__)
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
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__)
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__)
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):
# (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
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
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__)
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
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
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__)
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
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
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