diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py index 649e33c..cb1b915 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py @@ -38,8 +38,7 @@ except ImportError: multiprocessing = None from webkitpy.tool import mocktool -mock_options = mocktool.MockOptions(results_directory='layout-test-results', - use_apache=True, +mock_options = mocktool.MockOptions(use_apache=True, configuration='Release') # FIXME: This should be used for all ports, not just WebKit Mac. See @@ -60,10 +59,7 @@ class PortTestCase(unittest.TestCase): if not maker: return None - port = maker(options=options) - if hasattr(options, "results_directory"): - port._options.results_directory = port.results_directory() - return port + return maker(options=options) def test_default_worker_model(self): port = self.make_port() @@ -81,6 +77,12 @@ class PortTestCase(unittest.TestCase): return self.assertTrue(len(port.driver_cmd_line())) + options = mocktool.MockOptions(additional_drt_flag=['--foo=bar', '--foo=baz']) + port = self.make_port(options=options) + cmd_line = port.driver_cmd_line() + self.assertTrue('--foo=bar' in cmd_line) + self.assertTrue('--foo=baz' in cmd_line) + def disabled_test_http_server(self): port = self.make_port() if not port: @@ -113,6 +115,30 @@ class PortTestCase(unittest.TestCase): port._filesystem.remove(tmpfile) + def test_diff_image__missing_both(self): + port = self.make_port() + if not port: + return + self.assertFalse(port.diff_image(None, None, None)) + self.assertFalse(port.diff_image(None, '', None)) + self.assertFalse(port.diff_image('', None, None)) + self.assertFalse(port.diff_image('', '', None)) + + def test_diff_image__missing_actual(self): + port = self.make_port() + if not port: + return + self.assertTrue(port.diff_image(None, 'foo', None)) + self.assertTrue(port.diff_image('', 'foo', None)) + + def test_diff_image__missing_expected(self): + port = self.make_port() + if not port: + return + self.assertTrue(port.diff_image('foo', None, None)) + self.assertTrue(port.diff_image('foo', '', None)) + + def disabled_test_websocket_server(self): port = self.make_port() if not port: |