OLD | NEW |
1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 21 matching lines...) Expand all Loading... |
32 import logging | 32 import logging |
33 import os | 33 import os |
34 import socket | 34 import socket |
35 import sys | 35 import sys |
36 import time | 36 import time |
37 import unittest | 37 import unittest |
38 | 38 |
39 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 | 39 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2 |
40 from webkitpy.common.system.filesystem_mock import MockFileSystem | 40 from webkitpy.common.system.filesystem_mock import MockFileSystem |
41 from webkitpy.common.system.outputcapture import OutputCapture | 41 from webkitpy.common.system.outputcapture import OutputCapture |
| 42 from webkitpy.common.system.systemhost import SystemHost |
42 from webkitpy.common.system.systemhost_mock import MockSystemHost | 43 from webkitpy.common.system.systemhost_mock import MockSystemHost |
43 from webkitpy.layout_tests.models import test_run_results | 44 from webkitpy.layout_tests.models import test_run_results |
44 from webkitpy.layout_tests.port.base import Port, TestConfiguration | 45 from webkitpy.layout_tests.port.base import Port, TestConfiguration |
45 from webkitpy.layout_tests.port.server_process_mock import MockServerProcess | 46 from webkitpy.layout_tests.port.server_process_mock import MockServerProcess |
46 from webkitpy.tool.mocktool import MockOptions | 47 from webkitpy.tool.mocktool import MockOptions |
47 | 48 |
48 | 49 |
49 # FIXME: get rid of this fixture | 50 # FIXME: get rid of this fixture |
50 class TestWebKitPort(Port): | 51 class TestWebKitPort(Port): |
51 port_name = "testwebkitport" | 52 port_name = "testwebkitport" |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 saved_environ = os.environ.copy() | 459 saved_environ = os.environ.copy() |
459 try: | 460 try: |
460 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' | 461 os.environ['WEBKIT_HTTP_SERVER_CONF_PATH'] = '/existing/httpd.conf' |
461 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd
.conf') | 462 self.assertEqual(port.path_to_apache_config_file(), '/existing/httpd
.conf') |
462 finally: | 463 finally: |
463 os.environ = saved_environ.copy() | 464 os.environ = saved_environ.copy() |
464 | 465 |
465 def test_additional_platform_directory(self): | 466 def test_additional_platform_directory(self): |
466 port = self.make_port(options=MockOptions(additional_platform_directory=
['/tmp/foo'])) | 467 port = self.make_port(options=MockOptions(additional_platform_directory=
['/tmp/foo'])) |
467 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo') | 468 self.assertEqual(port.baseline_search_path()[0], '/tmp/foo') |
| 469 |
| 470 def test_virtual_test_suites(self): |
| 471 port = self.make_port(host=SystemHost()) |
| 472 |
| 473 # Test that this returns *something* and doesn't raise an exception. |
| 474 self.assertNotEqual(port.virtual_test_suites(), None) |
OLD | NEW |