fix virtual_test_suites() for browser_test ports

Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py

Index: Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
index f357e8db715bc2caaeee0faf6cb6edd759dfb4f6..a2bf6419d529d865d122df91d30fee8b00a50e0a 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py
@@ -38,78 +38,58 @@ from webkitpy.layout_tests.port import port_testcase
 from webkitpy.layout_tests.port import browser_test_driver
 
 
-class BrowserTestLinuxTest(port_testcase.PortTestCase):
-    port_name = 'linux'
-    port_maker = browser_test.BrowserTestLinuxPort
+class _BrowserTestTestCaseMixin(object):
+
+    def test_check_sys_deps(self):
+        port = self.make_port()
+        port._executive = MockExecutive2(exit_code=0)
+        self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results.OK_EXIT_STATUS)
 
     def test_driver_name_option(self):
-        self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_tests'))._path_to_driver().endswith('browser_tests'))
+        self.assertTrue(self.make_port()._path_to_driver().endswith(self.driver_name_endswith))
 
-    def test_layout_tests_dir(self):
-        self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/test/data/printing/layout_tests'))
+    def test_default_timeout_ms(self):
+        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(),
+                         self.timeout_ms)
+        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(),
+                         3 * self.timeout_ms)
 
     def test_driver_type(self):
         self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_name='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver))
 
-    def test_check_sys_deps(self):
+    def test_layout_tests_dir(self):
+        self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/test/data/printing/layout_tests'))
+
+    def test_virtual_test_suites(self):
+        # The browser_tests port do not use virtual test suites, so we are just testing the stub.
         port = self.make_port()
-        port._executive = MockExecutive2(exit_code=0)
-        self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results.OK_EXIT_STATUS)
+        self.assertEqual(port.virtual_test_suites(), [])
 
-    def test_default_timeout_ms(self):
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 10000)
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 30000)
+
+class BrowserTestLinuxTest(_BrowserTestTestCaseMixin, port_testcase.PortTestCase):
+    port_name = 'linux'
+    port_maker = browser_test.BrowserTestLinuxPort
+    driver_name_endswith = 'browser_tests'
+    timeout_ms = 10 * 1000
 
 
-class BrowserTestWinTest(port_testcase.PortTestCase):
+class BrowserTestWinTest(_BrowserTestTestCaseMixin, port_testcase.PortTestCase):
     port_name = 'win'
     port_maker = browser_test.BrowserTestWinPort
     os_name = 'win'
     os_version = 'xp'
+    driver_name_endswith = 'browser_tests.exe'
+    timeout_ms = 20 * 1000
 
-    def test_driver_name_option(self):
-        self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_tests'))._path_to_driver().endswith('browser_tests.exe'))
-
-    def test_layout_tests_dir(self):
-        self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/test/data/printing/layout_tests'))
-
-    def test_driver_type(self):
-        self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_name='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver))
-
-    def test_check_sys_deps(self):
-        port = self.make_port()
-        port._executive = MockExecutive2(exit_code=0)
-        self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results.OK_EXIT_STATUS)
 
-    def test_default_timeout_ms(self):
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 20000)
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 60000)
-
-
-class BrowserTestMacTest(port_testcase.PortTestCase):
+class BrowserTestMacTest(_BrowserTestTestCaseMixin, port_testcase.PortTestCase):
     os_name = 'mac'
     os_version = 'snowleopard'
     port_name = 'mac'
     port_maker = browser_test.BrowserTestMacPort
-
-    def test_driver_name_option(self):
-        self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_tests'))._path_to_driver().endswith('browser_tests'))
-
-    def test_layout_tests_dir(self):
-        self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/test/data/printing/layout_tests'))
-
-    def test_driver_type(self):
-        self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_name='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver))
+    driver_name_endswith = 'browser_tests'
+    timeout_ms = 20 * 1000
 
     def test_driver_path(self):
         test_port = self.make_port(options=MockOptions(driver_name='browser_tests'))
         self.assertFalse('.app/Contents/MacOS' in test_port._path_to_driver())
-
-    def test_check_sys_deps(self):
-        port = self.make_port()
-        port._executive = MockExecutive2(exit_code=0)
-        self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results.OK_EXIT_STATUS)
-
-    def test_default_timeout_ms(self):
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Release')).default_timeout_ms(), 20000)
-        self.assertEqual(self.make_port(options=MockOptions(configuration='Debug')).default_timeout_ms(), 60000)