Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py |
index 03ed463f091f79c7c50f6dc3a8c53a4f3e74ea68..b4129f8646017c85092661ab66f5917cb019405b 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py |
@@ -42,6 +42,7 @@ from webkitpy.layout_tests.port import test |
class FactoryTest(unittest.TestCase): |
"""Test that the factory creates the proper port object for given combination of port_name, host.platform, and options.""" |
+ |
# FIXME: The ports themselves should expose what options they require, |
# instead of passing generic "options". |
@@ -54,12 +55,10 @@ class FactoryTest(unittest.TestCase): |
self.assertIsInstance(port, cls) |
def test_mac(self): |
- self.assert_port(port_name='mac', os_name='mac', os_version='mac10.11', |
- cls=mac.MacPort) |
+ self.assert_port(port_name='mac', os_name='mac', os_version='mac10.11', cls=mac.MacPort) |
def test_linux(self): |
- self.assert_port(port_name='linux', os_name='linux', os_version='trusty', |
- cls=linux.LinuxPort) |
+ self.assert_port(port_name='linux', os_name='linux', os_version='trusty', cls=linux.LinuxPort) |
def test_android(self): |
self.assert_port(port_name='android', cls=android.AndroidPort) |
@@ -67,8 +66,7 @@ class FactoryTest(unittest.TestCase): |
def test_win(self): |
self.assert_port(port_name='win-win7', cls=win.WinPort) |
self.assert_port(port_name='win-win10', cls=win.WinPort) |
- self.assert_port(port_name='win', os_name='win', os_version='win7', |
- cls=win.WinPort) |
+ self.assert_port(port_name='win', os_name='win', os_version='win7', cls=win.WinPort) |
def test_unknown_specified(self): |
self.assertRaises(NotImplementedError, factory.PortFactory(MockSystemHost()).get, port_name='unknown') |
@@ -77,8 +75,7 @@ class FactoryTest(unittest.TestCase): |
self.assertRaises(NotImplementedError, factory.PortFactory(MockSystemHost(os_name='vms')).get) |
def test_get_from_builder_name(self): |
- self.assertEqual(factory.PortFactory(MockSystemHost()).get_from_builder_name('WebKit Mac10.11').name(), |
- 'mac-mac10.11') |
+ self.assertEqual(factory.PortFactory(MockSystemHost()).get_from_builder_name('WebKit Mac10.11').name(), 'mac-mac10.11') |
def get_port(self, target=None, configuration=None, files=None): |
host = MockSystemHost() |
@@ -152,5 +149,8 @@ class FactoryTest(unittest.TestCase): |
self.assertRaises(ValueError, self.get_port, target='unknown') |
def test_both_configuration_and_target_is_an_error(self): |
- self.assertRaises(ValueError, self.get_port, target='Debug', configuration='Release', |
+ self.assertRaises(ValueError, |
+ self.get_port, |
+ target='Debug', |
+ configuration='Release', |
files={'out/Debug/toolchain.ninja': ''}) |