Modifications to layout test framework so that it can work with browser_tests.

Tools/Scripts/webkitpy/layout_tests/port/browser_test.py

+# Copyright (C) 2014 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the Google name nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (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 base
+from webkitpy.layout_tests.port import linux
+from webkitpy.layout_tests.port import mac
+from webkitpy.layout_tests.port import win
+from webkitpy.layout_tests.port import browser_test_driver
+
+
+def get_port_class_name(port_name):
+    if 'linux' in port_name:
+        return 'BrowserTestLinuxPort'
+    elif 'mac' in port_name:
+        return 'BrowserTestMacPort'
+    elif 'win' in port_name:
+        return 'BrowserTestWinPort'
+    return None
+
+
+class BrowserTestPortOverrides(base.Port):
+    """Set of overrides that every browser test platform port should have."""
+
+    def _driver_class(self):
+        return browser_test_driver.BrowserTestDriver
+
+    def layout_tests_dir(self):
+        """Overriden function from the base port class. Redirects everything
+        to src/chrome/test/data/printing/layout_tests.
+        """
+        return self.path_from_chromium_base('chrome', 'test', 'data', 'printing', 'layout_tests', 'tests')
+
+
+class BrowserTestLinuxPort(linux.LinuxPort, BrowserTestPortOverrides):
+    @classmethod
+    def determine_full_port_name(cls, host, options, port_name):
+        return linux.LinuxPort.determine_full_port_name(host, options, port_name)

[Dirk Pranke, 2014/07/17 00:03:06]

Odd, one of my comments got dropped somewhere. Why do you need to override
determine_full_port_name() in these classes ?

a) aren't you invoking the methods that would normally get invoked anyway via
multiple inheritance?
b) given that this is only invoked via port_factory.get(), and you're
short-circuiting get() and calling get_port_class_name() instead, won't these
never be called?

[ivandavid, 2014/07/17 00:18:09]

Done.

[ivandavid, 2014/07/17 00:18:09]

Oops. This is a hold over from some other code I wrote when I was trying to
figure out how this stuff worked. I removed it.

+
+
+class BrowserTestMacPort(mac.MacPort, BrowserTestPortOverrides):
+    @classmethod
+    def determine_full_port_name(cls, host, options, port_name):
+        return mac.MacPort.determine_full_port_name(host, options, port_name)
+
+    def _path_to_driver(self, configuration=None):
+        return self._build_path_with_configuration(configuration, self.driver_name())

[Dirk Pranke, 2014/07/16 23:37:20]

Do you actually need this override?

[ivandavid, 2014/07/16 23:53:52]

Yes, if it isn't overridden, the one in mac.py can't find the driver as it
appends extra directories and file extensions to the driver_name.

[Dirk Pranke, 2014/07/16 23:59:30]

ah, right.

+
+
+class BrowserTestWinPort(win.WinPort, BrowserTestPortOverrides):
+    @classmethod
+    def determine_full_port_name(cls, host, options, port_name):
+        return win.WinPort.determine_full_port_name(host, options, port_name)