Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py

Issue 569913002: fix virtual_test_suites() for browser_test ports (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2014 Google Inc. All rights reserved. 1 # Copyright (C) 2014 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 11 matching lines...) Expand all
22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 28
29 import unittest 29 import unittest
30 30
31 from webkitpy.common.system.executive_mock import MockExecutive2 31 from webkitpy.common.system.executive_mock import MockExecutive2
32 from webkitpy.common.system.systemhost import SystemHost
32 from webkitpy.common.system.systemhost_mock import MockSystemHost 33 from webkitpy.common.system.systemhost_mock import MockSystemHost
33 from webkitpy.tool.mocktool import MockOptions 34 from webkitpy.tool.mocktool import MockOptions
34 35
35 from webkitpy.layout_tests.models import test_run_results 36 from webkitpy.layout_tests.models import test_run_results
36 from webkitpy.layout_tests.port import browser_test 37 from webkitpy.layout_tests.port import browser_test
37 from webkitpy.layout_tests.port import port_testcase 38 from webkitpy.layout_tests.port import port_testcase
38 from webkitpy.layout_tests.port import browser_test_driver 39 from webkitpy.layout_tests.port import browser_test_driver
39 40
40 41
41 class BrowserTestLinuxTest(port_testcase.PortTestCase): 42 class BrowserTestLinuxTest(port_testcase.PortTestCase):
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 79
79 def test_check_sys_deps(self): 80 def test_check_sys_deps(self):
80 port = self.make_port() 81 port = self.make_port()
81 port._executive = MockExecutive2(exit_code=0) 82 port._executive = MockExecutive2(exit_code=0)
82 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results .OK_EXIT_STATUS) 83 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results .OK_EXIT_STATUS)
83 84
84 def test_default_timeout_ms(self): 85 def test_default_timeout_ms(self):
85 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea se')).default_timeout_ms(), 20000) 86 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea se')).default_timeout_ms(), 20000)
86 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug ')).default_timeout_ms(), 60000) 87 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug ')).default_timeout_ms(), 60000)
87 88
89 def test_virtual_test_suites(self):
90 # We override this test to ensure that we're passing a full port name (a nd hence can run
91 # the test on all platforms).
92 port = self.make_port(host=SystemHost(), port_name='win-win7')
93
88 94
89 class BrowserTestMacTest(port_testcase.PortTestCase): 95 class BrowserTestMacTest(port_testcase.PortTestCase):
90 os_name = 'mac' 96 os_name = 'mac'
91 os_version = 'snowleopard' 97 os_version = 'snowleopard'
92 port_name = 'mac' 98 port_name = 'mac'
93 port_maker = browser_test.BrowserTestMacPort 99 port_maker = browser_test.BrowserTestMacPort
94 100
95 def test_driver_name_option(self): 101 def test_driver_name_option(self):
96 self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_ tests'))._path_to_driver().endswith('browser_tests')) 102 self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_ tests'))._path_to_driver().endswith('browser_tests'))
97 103
98 def test_layout_tests_dir(self): 104 def test_layout_tests_dir(self):
99 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes t/data/printing/layout_tests')) 105 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes t/data/printing/layout_tests'))
100 106
101 def test_driver_type(self): 107 def test_driver_type(self):
102 self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_nam e='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver)) 108 self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_nam e='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver))
103 109
104 def test_driver_path(self): 110 def test_driver_path(self):
105 test_port = self.make_port(options=MockOptions(driver_name='browser_test s')) 111 test_port = self.make_port(options=MockOptions(driver_name='browser_test s'))
106 self.assertFalse('.app/Contents/MacOS' in test_port._path_to_driver()) 112 self.assertFalse('.app/Contents/MacOS' in test_port._path_to_driver())
107 113
108 def test_check_sys_deps(self): 114 def test_check_sys_deps(self):
109 port = self.make_port() 115 port = self.make_port()
110 port._executive = MockExecutive2(exit_code=0) 116 port._executive = MockExecutive2(exit_code=0)
111 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results .OK_EXIT_STATUS) 117 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results .OK_EXIT_STATUS)
112 118
113 def test_default_timeout_ms(self): 119 def test_default_timeout_ms(self):
114 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea se')).default_timeout_ms(), 20000) 120 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea se')).default_timeout_ms(), 20000)
115 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug ')).default_timeout_ms(), 60000) 121 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug ')).default_timeout_ms(), 60000)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698