| OLD | NEW |
| 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 25 matching lines...) Expand all Loading... |
| 36 from webkitpy.layout_tests.port import browser_test | 36 from webkitpy.layout_tests.port import browser_test |
| 37 from webkitpy.layout_tests.port import port_testcase | 37 from webkitpy.layout_tests.port import port_testcase |
| 38 from webkitpy.layout_tests.port import browser_test_driver | 38 from webkitpy.layout_tests.port import browser_test_driver |
| 39 | 39 |
| 40 | 40 |
| 41 class BrowserTestLinuxTest(port_testcase.PortTestCase): | 41 class BrowserTestLinuxTest(port_testcase.PortTestCase): |
| 42 port_name = 'linux' | 42 port_name = 'linux' |
| 43 port_maker = browser_test.BrowserTestLinuxPort | 43 port_maker = browser_test.BrowserTestLinuxPort |
| 44 | 44 |
| 45 def test_driver_name_option(self): | 45 def test_driver_name_option(self): |
| 46 self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_
tests'))._path_to_driver().endswith('browser_tests')) | 46 self.assertTrue( |
| 47 self.make_port( |
| 48 options=MockOptions( |
| 49 driver_name='browser_tests'))._path_to_driver().endswith('br
owser_tests')) |
| 47 | 50 |
| 48 def test_layout_tests_dir(self): | 51 def test_layout_tests_dir(self): |
| 49 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) | 52 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) |
| 50 | 53 |
| 51 def test_driver_type(self): | 54 def test_driver_type(self): |
| 52 self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_nam
e='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver)) | 55 self.assertTrue( |
| 56 isinstance( |
| 57 self.make_port( |
| 58 options=MockOptions( |
| 59 driver_name='browser_tests')).create_driver(1), |
| 60 browser_test_driver.BrowserTestDriver)) |
| 53 | 61 |
| 54 def test_check_sys_deps(self): | 62 def test_check_sys_deps(self): |
| 55 port = self.make_port() | 63 port = self.make_port() |
| 56 port._executive = MockExecutive2(exit_code=0) | 64 port._executive = MockExecutive2(exit_code=0) |
| 57 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) | 65 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) |
| 58 | 66 |
| 59 def test_default_timeout_ms(self): | 67 def test_default_timeout_ms(self): |
| 60 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea
se')).default_timeout_ms(), 10000) | 68 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea
se')).default_timeout_ms(), 10000) |
| 61 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug
')).default_timeout_ms(), 30000) | 69 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug
')).default_timeout_ms(), 30000) |
| 62 | 70 |
| 63 | 71 |
| 64 class BrowserTestWinTest(port_testcase.PortTestCase): | 72 class BrowserTestWinTest(port_testcase.PortTestCase): |
| 65 port_name = 'win' | 73 port_name = 'win' |
| 66 port_maker = browser_test.BrowserTestWinPort | 74 port_maker = browser_test.BrowserTestWinPort |
| 67 os_name = 'win' | 75 os_name = 'win' |
| 68 os_version = 'xp' | 76 os_version = 'xp' |
| 69 | 77 |
| 70 def test_driver_name_option(self): | 78 def test_driver_name_option(self): |
| 71 self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_
tests'))._path_to_driver().endswith('browser_tests.exe')) | 79 self.assertTrue( |
| 80 self.make_port( |
| 81 options=MockOptions( |
| 82 driver_name='browser_tests'))._path_to_driver().endswith('br
owser_tests.exe')) |
| 72 | 83 |
| 73 def test_layout_tests_dir(self): | 84 def test_layout_tests_dir(self): |
| 74 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) | 85 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) |
| 75 | 86 |
| 76 def test_driver_type(self): | 87 def test_driver_type(self): |
| 77 self.assertTrue(isinstance(self.make_port(options=MockOptions(driver_nam
e='browser_tests')).create_driver(1), browser_test_driver.BrowserTestDriver)) | 88 self.assertTrue( |
| 89 isinstance( |
| 90 self.make_port( |
| 91 options=MockOptions( |
| 92 driver_name='browser_tests')).create_driver(1), |
| 93 browser_test_driver.BrowserTestDriver)) |
| 78 | 94 |
| 79 def test_check_sys_deps(self): | 95 def test_check_sys_deps(self): |
| 80 port = self.make_port() | 96 port = self.make_port() |
| 81 port._executive = MockExecutive2(exit_code=0) | 97 port._executive = MockExecutive2(exit_code=0) |
| 82 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) | 98 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) |
| 83 | 99 |
| 84 def test_default_timeout_ms(self): | 100 def test_default_timeout_ms(self): |
| 85 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea
se')).default_timeout_ms(), 20000) | 101 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) | 102 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug
')).default_timeout_ms(), 60000) |
| 87 | 103 |
| 88 | 104 |
| 89 class BrowserTestMacTest(port_testcase.PortTestCase): | 105 class BrowserTestMacTest(port_testcase.PortTestCase): |
| 90 os_name = 'mac' | 106 os_name = 'mac' |
| 91 os_version = 'snowleopard' | 107 os_version = 'snowleopard' |
| 92 port_name = 'mac' | 108 port_name = 'mac' |
| 93 port_maker = browser_test.BrowserTestMacPort | 109 port_maker = browser_test.BrowserTestMacPort |
| 94 | 110 |
| 95 def test_driver_name_option(self): | 111 def test_driver_name_option(self): |
| 96 self.assertTrue(self.make_port(options=MockOptions(driver_name='browser_
tests'))._path_to_driver().endswith('browser_tests')) | 112 self.assertTrue( |
| 113 self.make_port( |
| 114 options=MockOptions( |
| 115 driver_name='browser_tests'))._path_to_driver().endswith('br
owser_tests')) |
| 97 | 116 |
| 98 def test_layout_tests_dir(self): | 117 def test_layout_tests_dir(self): |
| 99 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) | 118 self.assertTrue(self.make_port().layout_tests_dir().endswith('chrome/tes
t/data/printing/layout_tests')) |
| 100 | 119 |
| 101 def test_driver_type(self): | 120 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)) | 121 self.assertTrue( |
| 122 isinstance( |
| 123 self.make_port( |
| 124 options=MockOptions( |
| 125 driver_name='browser_tests')).create_driver(1), |
| 126 browser_test_driver.BrowserTestDriver)) |
| 103 | 127 |
| 104 def test_driver_path(self): | 128 def test_driver_path(self): |
| 105 test_port = self.make_port(options=MockOptions(driver_name='browser_test
s')) | 129 test_port = self.make_port(options=MockOptions(driver_name='browser_test
s')) |
| 106 self.assertFalse('.app/Contents/MacOS' in test_port._path_to_driver()) | 130 self.assertFalse('.app/Contents/MacOS' in test_port._path_to_driver()) |
| 107 | 131 |
| 108 def test_check_sys_deps(self): | 132 def test_check_sys_deps(self): |
| 109 port = self.make_port() | 133 port = self.make_port() |
| 110 port._executive = MockExecutive2(exit_code=0) | 134 port._executive = MockExecutive2(exit_code=0) |
| 111 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) | 135 self.assertEqual(port.check_sys_deps(needs_http=False), test_run_results
.OK_EXIT_STATUS) |
| 112 | 136 |
| 113 def test_default_timeout_ms(self): | 137 def test_default_timeout_ms(self): |
| 114 self.assertEqual(self.make_port(options=MockOptions(configuration='Relea
se')).default_timeout_ms(), 20000) | 138 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) | 139 self.assertEqual(self.make_port(options=MockOptions(configuration='Debug
')).default_timeout_ms(), 60000) |
| OLD | NEW |