Index: Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
index 47f87fb884264c126269ae16dbb98033a6d108a9..e3fefb3b38b6e2c6f1b89b45777ffda9aa8d7467 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py |
@@ -40,6 +40,7 @@ from webkitpy.tool.mocktool import MockOptions |
class DriverTest(unittest.TestCase): |
+ |
def make_port(self): |
port = Port(MockSystemHost(), 'test', MockOptions(configuration='Release')) |
port._config.build_directory = lambda configuration: '/mock-checkout/out/' + configuration |
@@ -51,11 +52,11 @@ class DriverTest(unittest.TestCase): |
def test_command_wrapper(self): |
self._assert_wrapper(None, []) |
- self._assert_wrapper("valgrind", ["valgrind"]) |
+ self._assert_wrapper('valgrind', ['valgrind']) |
# Validate that shlex works as expected. |
- command_with_spaces = "valgrind --smc-check=\"check with spaces!\" --foo" |
- expected_parse = ["valgrind", "--smc-check=check with spaces!", "--foo"] |
+ command_with_spaces = 'valgrind --smc-check=\'check with spaces!\' --foo' |
+ expected_parse = ['valgrind', '--smc-check=check with spaces!', '--foo'] |
self._assert_wrapper(command_with_spaces, expected_parse) |
def test_test_to_uri(self): |
@@ -79,7 +80,7 @@ class DriverTest(unittest.TestCase): |
'ActualHash: foobar', |
'Content-Type: my_type', |
'Content-Transfer-Encoding: none', |
- "#EOF", |
+ '#EOF', |
]) |
content_block = driver._read_block(0) |
self.assertEqual(content_block.content, '') |
@@ -96,8 +97,8 @@ class DriverTest(unittest.TestCase): |
'ExpectedHash: expected', |
'Content-Type: image/png', |
'Content-Length: 9', |
- "12345678", |
- "#EOF", |
+ '12345678', |
+ '#EOF', |
]) |
content_block = driver._read_block(0) |
self.assertEqual(content_block.content_type, 'image/png') |
@@ -128,13 +129,17 @@ class DriverTest(unittest.TestCase): |
port = TestWebKitPort() |
port._config.build_directory = lambda configuration: '/mock-checkout/out/' + configuration |
driver = Driver(port, 0, pixel_tests=True, no_timeout=True) |
- self.assertEqual(driver.cmd_line(True, []), ['/mock-checkout/out/Release/content_shell', '--no-timeout', '--dump-render-tree', '-']) |
+ self.assertEqual( |
+ driver.cmd_line( |
+ True, []), [ |
+ '/mock-checkout/out/Release/content_shell', '--no-timeout', '--dump-render-tree', '-']) |
def test_check_for_driver_crash(self): |
port = TestWebKitPort() |
driver = Driver(port, 0, pixel_tests=True) |
class FakeServerProcess(object): |
+ |
def __init__(self, crashed): |
self.crashed = crashed |