Chromium Code Reviews| Index: Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py |
| diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py |
| index b0d6cc019daf36579e9ed2cc37976640da3b5645..132a204081f7945e96cf564f407ee051feb39738 100644 |
| --- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py |
| +++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py |
| @@ -108,6 +108,7 @@ class PortTestCase(unittest.TestCase): |
| port._dump_reader.check_is_functional = lambda: True |
| port._options.build = True |
| port._check_driver_build_up_to_date = lambda config: True |
| + port.check_httpd = lambda: True |
|
scottmg
2014/02/06 01:11:32
maybe just delete this? it looks like it's only us
Dirk Pranke
2014/02/06 01:32:11
Ah, bad merge; this'll be needed in a later patch.
|
| oc = OutputCapture() |
| try: |
| oc.capture_output() |
| @@ -154,7 +155,7 @@ class PortTestCase(unittest.TestCase): |
| self.assertTrue('--foo=baz' in cmd_line) |
| def test_uses_apache(self): |
| - self.assertTrue(self.make_port()._uses_apache()) |
| + self.assertTrue(self.make_port().uses_apache()) |
| def assert_servers_are_down(self, host, ports): |
| for port in ports: |
| @@ -448,22 +449,22 @@ class PortTestCase(unittest.TestCase): |
| saved_environ = os.environ.copy() |
| try: |
| os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/path/to/httpd.conf' |
| - self.assertRaises(IOError, port._path_to_apache_config_file) |
| + self.assertRaises(IOError, port.path_to_apache_config_file) |
| port._filesystem.write_text_file('/existing/httpd.conf', 'Hello, world!') |
| os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' |
| - self.assertEqual(port._path_to_apache_config_file(), '/existing/httpd.conf') |
| + self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd.conf') |
| finally: |
| os.environ = saved_environ.copy() |
| # Mock out _apache_config_file_name_for_platform to ignore the passed sys.platform value. |
| port._apache_config_file_name_for_platform = lambda platform: 'httpd.conf' |
| - self.assertEqual(port._path_to_apache_config_file(), '/mock-checkout/third_party/WebKit/LayoutTests/http/conf/httpd.conf') |
| + self.assertEqual(port.path_to_apache_config_file(), '/mock-checkout/third_party/WebKit/LayoutTests/http/conf/httpd.conf') |
| # Check that even if we mock out _apache_config_file_name, the environment variable takes precedence. |
| saved_environ = os.environ.copy() |
| try: |
| os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' |
| - self.assertEqual(port._path_to_apache_config_file(), '/existing/httpd.conf') |
| + self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd.conf') |
| finally: |
| os.environ = saved_environ.copy() |