Changeset 148075 in webkit
- Timestamp:
- Apr 9, 2013 9:59:35 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 11 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html
r135199 r148075 33 33 style-src 'self' 'unsafe-inline' file: https://ajax.googleapis.com http://fonts.googleapis.com; 34 34 font-src http://themes.googleusercontent.com; 35 img-src 'self' https://ajax.googleapis.com http://build. chromium.org http://build.webkit.org;36 media-src 'self' http://build. chromium.org http://build.webkit.org;37 frame-src 'self' http://build. chromium.org http://build.webkit.org http://test-results.appspot.com;38 connect-src 'self' http://trac.webkit.org http://build. chromium.org http://build.webkit.org">35 img-src 'self' https://ajax.googleapis.com http://build.webkit.org; 36 media-src 'self' http://build.webkit.org; 37 frame-src 'self' http://build.webkit.org http://test-results.appspot.com; 38 connect-src 'self' http://trac.webkit.org http://build.webkit.org"> 39 39 <title>Garden-O-Matic</title> 40 40 <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,700"> -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js
r144739 r148075 59 59 _builderApplies: function(builderName) { 60 60 return builderName.indexOf('Apple') != -1; 61 },62 },63 'chromium' : {64 label : 'Chromium',65 buildConsoleURL: 'http://build.chromium.org/p/chromium.webkit',66 layoutTestResultsURL: 'http://build.chromium.org/f/chromium/layout_test_results',67 waterfallURL: 'http://build.chromium.org/p/chromium.webkit/waterfall',68 builders: {69 'WebKit XP': {version: 'xp'},70 'WebKit Win7': {version: 'win7'},71 'WebKit Win7 (dbg)(1)': {version: 'win7', debug: true},72 'WebKit Win7 (dbg)(2)': {version: 'win7', debug: true},73 'WebKit Linux': {version: 'lucid', is64bit: true},74 'WebKit Linux 32': {version: 'lucid'},75 'WebKit Linux (dbg)': {version: 'lucid', is64bit: true, debug: true},76 'WebKit Mac10.6': {version: 'snowleopard'},77 'WebKit Mac10.6 (dbg)': {version: 'snowleopard', debug: true},78 'WebKit Mac10.7': {version: 'lion'},79 'WebKit Mac10.7 (dbg)': {version: 'lion', debug: true},80 'WebKit Mac10.8': {version: 'mountainlion'},81 },82 haveBuilderAccumulatedResults : true,83 useDirectoryListingForOldBuilds: true,84 useFlakinessDashboard: true,85 resultsDirectoryNameFromBuilderName: function(builderName) {86 return base.underscoredBuilderName(builderName);87 },88 resultsDirectoryForBuildNumber: function(buildNumber, revision) {89 return buildNumber;90 },91 _builderApplies: function(builderName) {92 // FIXME: Should garden-o-matic show these? I can imagine showing the deps bots being useful at least so93 // that the gardener only need to look at garden-o-matic and never at the waterfall. Not really sure who94 // watches the GPU bots.95 // The 10.8 Tests bot is really an FYI bot at this point96 // WebKit Android doesn't upload its results yet.97 return builderName.indexOf('GPU') == -1 &&98 builderName.indexOf('deps') == -1 &&99 builderName.indexOf('ASAN') == -1 &&100 builderName.indexOf('WebKit (Content Shell) Android') == -1 &&101 builderName.indexOf('Mac10.8 Tests') == -1 &&102 builderName.indexOf('WebKit Android') == -1;103 61 }, 104 62 }, … … 188 146 config.kExperimentalFeatures = window.location.search.search('enableExperiments=1') != -1; 189 147 190 config.currentPlatform = base.getURLParameter('platform') || ' chromium';148 config.currentPlatform = base.getURLParameter('platform') || 'apple'; 191 149 192 150 // FIXME: We should add a way to restrict the results to a subset of the builders -
trunk/Tools/ChangeLog
r148055 r148075 1 2013-04-09 Glenn Adams <glenn@skynav.com> 2 3 [webkitpy] Remove chromium ports. 4 https://bugs.webkit.org/show_bug.cgi?id=114326 5 6 Reviewed by Dirk Pranke. 7 8 As a side effect, also: 9 10 - remove chromium builders from webkitpy.layout_tests.port.builders 11 - remove chromium builders from rebaseline 12 - rewrite chromium dependent tests in rebaseline_unittest 13 - remove chromium platform from garden-o-matic 14 - select apple platform as default platform in garden-o-matic 15 - remove chromium port dependencies from a few other tests (run_webkit_tests_integrationtest, factory_unittest, style.checkers.test_expectations_unittest) 16 17 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html: 18 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js: 19 * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py: 20 (BaselineOptimizerTest.test_move_baselines): 21 (BaselineOptimizerTest.test_efl): 22 (BaselineOptimizerTest.test_no_add_mac_future): 23 (BaselineOptimizerTest.test_win_does_not_drop_to_win_7sp0): 24 (BaselineOptimizerTest.test_common_directory_includes_root): 25 (BaselineOptimizerTest.test_complex_shadowing): 26 (BaselineOptimizerTest.test_virtual_ports_filtered): 27 * Scripts/webkitpy/layout_tests/port/builders.py: 28 * Scripts/webkitpy/layout_tests/port/chromium.py: Removed. 29 * Scripts/webkitpy/layout_tests/port/chromium_android.py: Removed. 30 * Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py: Removed. 31 * Scripts/webkitpy/layout_tests/port/chromium_linux.py: Removed. 32 * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py: Removed. 33 * Scripts/webkitpy/layout_tests/port/chromium_mac.py: Removed. 34 * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py: Removed. 35 * Scripts/webkitpy/layout_tests/port/chromium_port_testcase.py: Removed. 36 * Scripts/webkitpy/layout_tests/port/chromium_unittest.py: Removed. 37 * Scripts/webkitpy/layout_tests/port/chromium_win.py: Removed. 38 * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py: Removed. 39 * Scripts/webkitpy/layout_tests/port/factory.py: 40 (platform_options): 41 (PortFactory): 42 * Scripts/webkitpy/layout_tests/port/factory_unittest.py: 43 (FactoryTest.test_qt): 44 (FactoryTest.test_get_from_builder_name): 45 * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py: 46 (RunTest.test_build_check): 47 * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: 48 (TestExpectationsTestCase.test_determine_port_from_expectations_path): 49 * Scripts/webkitpy/tool/commands/rebaseline.py: 50 (Rebaseline._builders_to_pull_from): 51 * Scripts/webkitpy/tool/commands/rebaseline_unittest.py: 52 (_BaseTestCase): 53 (_BaseTestCase.setUp): 54 (TestRebaselineTest.setUp): 55 (TestRebaselineTest.test_baseline_directory): 56 (test_rebaseline_updates_expectations_file): 57 (test_rebaseline_does_not_include_overrides): 58 (test_rebaseline_test): 59 (test_rebaseline_test_and_print_scm_changes): 60 (test_rebaseline_and_copy_test): 61 (test_rebaseline_and_copy_test_no_existing_result): 62 (test_rebaseline_and_copy_test_with_lion_result): 63 (test_rebaseline_and_copy_no_overwrite_test): 64 (TestRebaselineExpectations.test_rebaseline_expectations): 65 1 66 2013-04-09 Ryosuke Niwa <rniwa@webkit.org> 2 67 -
trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py
r140510 r148075 62 62 def test_move_baselines(self): 63 63 host = MockHost() 64 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/ chromium-win/another/test-expected.txt', 'result A')65 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/ chromium-mac/another/test-expected.txt', 'result A')66 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/ chromium/another/test-expected.txt', 'result B')64 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/mac-lion/another/test-expected.txt', 'result A') 65 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/mac-lion-wk2/another/test-expected.txt', 'result A') 66 host.filesystem.write_binary_file('/mock-checkout/LayoutTests/platform/mac/another/test-expected.txt', 'result B') 67 67 baseline_optimizer = BaselineOptimizer(host, host.port_factory.all_port_names()) 68 68 baseline_optimizer._move_baselines('another/test-expected.txt', { 69 'LayoutTests/platform/ chromium-win': 'aaa',70 'LayoutTests/platform/ chromium-mac': 'aaa',71 'LayoutTests/platform/ chromium': 'bbb',69 'LayoutTests/platform/mac-lion': 'aaa', 70 'LayoutTests/platform/mac-lion-wk2': 'aaa', 71 'LayoutTests/platform/mac': 'bbb', 72 72 }, { 73 'LayoutTests/platform/ chromium': 'aaa',73 'LayoutTests/platform/mac': 'aaa', 74 74 }) 75 self.assertEqual(host.filesystem.read_binary_file('/mock-checkout/LayoutTests/platform/chromium/another/test-expected.txt'), 'result A') 76 77 def test_chromium_linux_redundant_with_win(self): 78 self._assertOptimization({ 79 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 80 'LayoutTests/platform/chromium-linux': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 81 }, { 82 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74', 83 }) 75 self.assertEqual(host.filesystem.read_binary_file('/mock-checkout/LayoutTests/platform/mac/another/test-expected.txt'), 'result A') 84 76 85 77 def test_efl(self): … … 90 82 }) 91 83 92 93 84 def test_no_add_mac_future(self): 94 85 self._assertOptimization({ … … 96 87 'LayoutTests/platform/win-xp': '453e67177a75b2e79905154ece0efba6e5bfb65d', 97 88 'LayoutTests/platform/mac-lion': 'c43eaeb358f49d5e835236ae23b7e49d7f2b089f', 98 'LayoutTests/platform/chromium-mac': 'a9ba153c700a94ae1b206d8e4a75a621a89b4554',99 89 }, { 100 90 'LayoutTests/platform/mac': '29a1715a6470d5dd9486a142f609708de84cdac8', 101 91 'LayoutTests/platform/win-xp': '453e67177a75b2e79905154ece0efba6e5bfb65d', 102 92 'LayoutTests/platform/mac-lion': 'c43eaeb358f49d5e835236ae23b7e49d7f2b089f', 103 'LayoutTests/platform/chromium-mac': 'a9ba153c700a94ae1b206d8e4a75a621a89b4554',104 })105 106 def test_chromium_covers_mac_win_linux(self):107 self._assertOptimization({108 'LayoutTests/platform/chromium-mac': '462d03b9c025db1b0392d7453310dbee5f9a9e74',109 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',110 'LayoutTests/platform/chromium-linux': '462d03b9c025db1b0392d7453310dbee5f9a9e74',111 }, {112 'LayoutTests/platform/chromium': '462d03b9c025db1b0392d7453310dbee5f9a9e74',113 93 }) 114 94 … … 133 113 'LayoutTests/platform/gtk': '3', 134 114 'LayoutTests/platform/qt': '4', 135 'LayoutTests/platform/chromium': '5',136 115 }, { 137 116 'LayoutTests/platform/win': '1', … … 139 118 'LayoutTests/platform/gtk': '3', 140 119 'LayoutTests/platform/qt': '4', 141 'LayoutTests/platform/chromium': '5',142 120 }) 143 121 … … 148 126 'LayoutTests/platform/gtk': 'e8608763f6241ddacdd5c1ef1973ba27177d0846', 149 127 'LayoutTests/platform/qt': 'bcbd457d545986b7abf1221655d722363079ac87', 150 'LayoutTests/platform/chromium-win': '3764ac11e1f9fbadd87a90a2e40278319190a0d3',151 128 'LayoutTests/platform/mac': 'e8608763f6241ddacdd5c1ef1973ba27177d0846', 152 129 }) 153 130 154 131 self._assertOptimization({ 155 'LayoutTests/platform/chromium-win': '23a30302a6910f8a48b1007fa36f3e3158341834',156 132 'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127', 157 'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',158 'LayoutTests/platform/chromium': '1',159 133 }, { 160 'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834',161 134 'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127', 162 135 }) … … 168 141 return 169 142 self._assertOptimization({ 170 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',171 143 'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364', 172 'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',173 144 'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e', 174 'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',175 145 'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7', 176 'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036',177 146 }, { 178 'LayoutTests/platform/chromium-win': '462d03b9c025db1b0392d7453310dbee5f9a9e74',179 147 'LayoutTests/platform/mac': '5daa78e55f05d9f0d1bb1f32b0cd1bc3a01e9364', 180 'LayoutTests/platform/chromium-win-xp': '462d03b9c025db1b0392d7453310dbee5f9a9e74',181 148 'LayoutTests/platform/mac-lion': '7ad045ece7c030e2283c5d21d9587be22bcba56e', 182 'LayoutTests/platform/chromium-win': 'f83af9732ce74f702b8c9c4a3d9a4c6636b8d3bd',183 149 'LayoutTests/platform/win-xp': '5b1253ef4d5094530d5f1bc6cdb95c90b446bec7', 184 'LayoutTests/platform/chromium-linux': 'f52fcdde9e4be8bd5142171cd859230bd4471036'185 150 }) 186 151 187 152 def test_virtual_ports_filtered(self): 188 153 self._assertOptimization({ 189 'LayoutTests/platform/chromium-mac': '1',190 'LayoutTests/platform/chromium-mac-snowleopard': '1',191 'LayoutTests/platform/chromium-win': '2',192 154 'LayoutTests/platform/gtk': '3', 193 155 'LayoutTests/platform/efl': '3', … … 195 157 'LayoutTests/platform/mac': '5', 196 158 }, { 197 'LayoutTests/platform/chromium-mac': '1',198 'LayoutTests/platform/chromium-win': '2',199 159 'LayoutTests': '3', 200 160 'LayoutTests/platform/qt': '4', -
trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py
r140026 r148075 46 46 47 47 _exact_matches = { 48 # These builders are on build.chromium.org.49 "WebKit XP": {"port_name": "chromium-win-xp", "is_debug": False},50 "WebKit Win7": {"port_name": "chromium-win-win7", "is_debug": False},51 "WebKit Win7 (dbg)(1)": {"port_name": "chromium-win-win7", "is_debug": True},52 "WebKit Win7 (dbg)(2)": {"port_name": "chromium-win-win7", "is_debug": True},53 "WebKit Linux": {"port_name": "chromium-linux-x86_64", "is_debug": False},54 "WebKit Linux 32": {"port_name": "chromium-linux-x86", "is_debug": False},55 "WebKit Linux (dbg)": {"port_name": "chromium-linux-x86_64", "is_debug": True},56 "WebKit Mac10.6": {"port_name": "chromium-mac-snowleopard", "is_debug": False},57 "WebKit Mac10.6 (dbg)": {"port_name": "chromium-mac-snowleopard", "is_debug": True},58 "WebKit Mac10.7": {"port_name": "chromium-mac-lion", "is_debug": False},59 "WebKit Mac10.7 (dbg)": {"port_name": "chromium-mac-lion", "is_debug": True},60 "WebKit Mac10.8": {"port_name": "chromium-mac-mountainlion", "is_debug": False},61 62 48 # These builders are on build.webkit.org. 63 49 "Apple MountainLion Release WK1 (Tests)": {"port_name": "mac-mountainlion", "is_debug": False, "rebaseline_override_dir": "mac"}, … … 95 81 r"GTK": "gtk", 96 82 r"Qt": "qt", 97 r"Chromium Mac": "chromium-mac",98 r"Chromium Linux": "chromium-linux",99 r"Chromium Win": "chromium-win",100 83 } 101 84 … … 105 88 "qt-win", 106 89 "qt-wk2", 107 # FIXME: Move to _extact_matches.108 "chromium-android",109 90 ] 110 91 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py
r136545 r148075 40 40 optparse.make_option('--platform', action='store', 41 41 help=('Glob-style list of platform/ports to use (e.g., "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')), 42 optparse.make_option('--chromium', action='store_const', dest='platform',43 const=('chromium*' if use_globs else 'chromium'),44 help=('Alias for --platform=chromium*' if use_globs else 'Alias for --platform=chromium')),45 optparse.make_option('--chromium-android', action='store_const', dest='platform',46 const=('chromium-android*' if use_globs else 'chromium-android'),47 help=('Alias for --platform=chromium-android*' if use_globs else 'Alias for --platform=chromium')),48 42 optparse.make_option('--efl', action='store_const', dest='platform', 49 43 const=('efl*' if use_globs else 'efl'), … … 81 75 class PortFactory(object): 82 76 PORT_CLASSES = ( 83 'chromium_android.ChromiumAndroidPort',84 'chromium_linux.ChromiumLinuxPort',85 'chromium_mac.ChromiumMacPort',86 'chromium_win.ChromiumWinPort',87 77 'efl.EflPort', 88 78 'gtk.GtkPort', -
trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
r140510 r148075 32 32 from webkitpy.common.system.systemhost_mock import MockSystemHost 33 33 34 from webkitpy.layout_tests.port import chromium_android35 from webkitpy.layout_tests.port import chromium_linux36 from webkitpy.layout_tests.port import chromium_mac37 from webkitpy.layout_tests.port import chromium_win38 34 from webkitpy.layout_tests.port import factory 39 35 from webkitpy.layout_tests.port import gtk … … 76 72 self.assert_port(port_name='qt', cls=qt.QtPort) 77 73 78 def test_chromium_mac(self):79 self.assert_port(port_name='chromium-mac', os_name='mac', os_version='snowleopard',80 cls=chromium_mac.ChromiumMacPort)81 self.assert_port(port_name='chromium', os_name='mac', os_version='lion',82 cls=chromium_mac.ChromiumMacPort)83 84 def test_chromium_linux(self):85 self.assert_port(port_name='chromium-linux', cls=chromium_linux.ChromiumLinuxPort)86 self.assert_port(port_name='chromium', os_name='linux', os_version='lucid',87 cls=chromium_linux.ChromiumLinuxPort)88 89 def test_chromium_android(self):90 self.assert_port(port_name='chromium-android', cls=chromium_android.ChromiumAndroidPort)91 # NOTE: We can't check for port_name=chromium here, as this will append the host's92 # operating system, whereas host!=target for Android.93 94 def test_chromium_win(self):95 self.assert_port(port_name='chromium-win-xp', cls=chromium_win.ChromiumWinPort)96 self.assert_port(port_name='chromium-win', os_name='win', os_version='xp',97 cls=chromium_win.ChromiumWinPort)98 self.assert_port(port_name='chromium', os_name='win', os_version='xp',99 cls=chromium_win.ChromiumWinPort)100 101 74 def test_unknown_specified(self): 102 75 self.assertRaises(NotImplementedError, factory.PortFactory(MockSystemHost()).get, port_name='unknown') … … 106 79 107 80 def test_get_from_builder_name(self): 108 self.assertEqual(factory.PortFactory(MockSystemHost()).get_from_builder_name(' WebKit Mac10.7').name(),109 ' chromium-mac-lion')81 self.assertEqual(factory.PortFactory(MockSystemHost()).get_from_builder_name('Apple Lion Release WK1 (Tests)').name(), 82 'mac-lion') -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
r146817 r148075 821 821 # By using a port_name for a different platform than the one we're running on, the build check should always fail. 822 822 if sys.platform == 'darwin': 823 port_name = ' chromium-linux-x86'823 port_name = 'qt-linux' 824 824 else: 825 port_name = 'chromium-mac-lion' 825 port_name = 'mac-lion' 826 port_name = 'mac-lion' 826 827 out = StringIO.StringIO() 827 828 err = StringIO.StringIO() -
trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py
r140510 r148075 75 75 def test_determine_port_from_expectations_path(self): 76 76 self._expect_port_for_expectations_path(None, '/') 77 self._expect_port_for_expectations_path(None, 'LayoutTests/chromium-mac/TestExpectations')78 self._expect_port_for_expectations_path('chromium', 'LayoutTests/platform/chromium/TestExpectations')79 77 self._expect_port_for_expectations_path(None, '/mock-checkout/LayoutTests/platform/win/TestExpectations') 80 78 self._expect_port_for_expectations_path('win', 'LayoutTests/platform/win/TestExpectations') -
trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
r142941 r148075 455 455 456 456 def _builders_to_pull_from(self): 457 chromium_buildbot_builder_names = []458 457 webkit_buildbot_builder_names = [] 459 458 for name in builders.all_builder_names(): 460 if self._tool.port_factory.get_from_builder_name(name).is_chromium(): 461 chromium_buildbot_builder_names.append(name) 462 else: 463 webkit_buildbot_builder_names.append(name) 464 465 titles = ["build.webkit.org bots", "build.chromium.org bots"] 466 lists = [webkit_buildbot_builder_names, chromium_buildbot_builder_names] 459 webkit_buildbot_builder_names.append(name) 460 461 titles = ["build.webkit.org bots"] 462 lists = [webkit_buildbot_builder_names] 467 463 468 464 chosen_names = self._tool.user.prompt_with_multiple_lists("Which builder to pull results from:", titles, lists, can_choose_multiple=True) -
trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
r146124 r148075 40 40 class _BaseTestCase(unittest.TestCase): 41 41 MOCK_WEB_RESULT = 'MOCK Web result, convert 404 to None=True' 42 WEB_PREFIX = 'http://example.com/f/builders/ WebKit Mac10.7/results/layout-test-results'42 WEB_PREFIX = 'http://example.com/f/builders/Apple Lion Release WK1 (Tests)/results/layout-test-results' 43 43 44 44 command_constructor = None … … 48 48 self.command = self.command_constructor() # lint warns that command_constructor might not be set, but this is intentional; pylint: disable=E1102 49 49 self.command.bind_to_tool(self.tool) 50 self.lion_port = self.tool.port_factory.get_from_builder_name(" WebKit Mac10.7")50 self.lion_port = self.tool.port_factory.get_from_builder_name("Apple Lion Release WK1 (Tests)") 51 51 self.lion_expectations_path = self.lion_port.path_to_test_expectations_file() 52 52 … … 79 79 def setUp(self): 80 80 super(TestRebaselineTest, self).setUp() 81 self.options = MockOptions(builder=" WebKit Mac10.7", test="userscripts/another-test.html", suffixes="txt",81 self.options = MockOptions(builder="Apple Lion Release WK1 (Tests)", test="userscripts/another-test.html", suffixes="txt", 82 82 move_overwritten_baselines_to=None, results_directory=None) 83 83 … … 88 88 self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-lion") 89 89 self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2") 90 self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac") 91 self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac") 90 92 self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug"), "/mock-checkout/LayoutTests/platform/gtk-wk1") 91 93 self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2") 92 94 self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl-wk2") 93 95 self.assertMultiLineEqual(command._baseline_directory("Qt Linux Release"), "/mock-checkout/LayoutTests/platform/qt") 94 self.assertMultiLineEqual(command._baseline_directory("WebKit Mac10.7"), "/mock-checkout/LayoutTests/platform/chromium-mac-lion")95 self.assertMultiLineEqual(command._baseline_directory("WebKit Mac10.6"), "/mock-checkout/LayoutTests/platform/chromium-mac-snowleopard")96 96 97 97 def test_rebaseline_updates_expectations_file_noop(self): … … 128 128 self.WEB_PREFIX + '/userscripts/another-test-actual.txt']) 129 129 new_expectations = self._read(self.lion_expectations_path) 130 self.assertMultiLineEqual(new_expectations, "Bug(x) [ M ountainLion SnowLeopard] userscripts/another-test.html [ ImageOnlyFailure ]\nbug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n")130 self.assertMultiLineEqual(new_expectations, "Bug(x) [ Mac ] userscripts/another-test.html [ ImageOnlyFailure ]\nbug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n") 131 131 132 132 def test_rebaseline_does_not_include_overrides(self): 133 133 self._write(self.lion_expectations_path, "Bug(x) [ Mac ] userscripts/another-test.html [ ImageOnlyFailure ]\nBug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n") 134 self._write(self.lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), "Bug(y) [ Mac ] other-test.html [ Failure ]\n")135 134 self._write("userscripts/another-test.html", "Dummy test contents") 136 135 … … 144 143 145 144 new_expectations = self._read(self.lion_expectations_path) 146 self.assertMultiLineEqual(new_expectations, "Bug(x) [ M ountainLion SnowLeopard] userscripts/another-test.html [ ImageOnlyFailure ]\nBug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n")145 self.assertMultiLineEqual(new_expectations, "Bug(x) [ Mac ] userscripts/another-test.html [ ImageOnlyFailure ]\nBug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n") 147 146 148 147 def test_rebaseline_test(self): 149 self.command._rebaseline_test(" WebKit Linux", "userscripts/another-test.html", None, "txt", self.WEB_PREFIX)148 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", None, "txt", self.WEB_PREFIX) 150 149 self.assertItemsEqual(self.tool.web.urls_fetched, [self.WEB_PREFIX + '/userscripts/another-test-actual.txt']) 151 150 … … 161 160 self.tool._scm.exists = lambda x: False 162 161 163 self.command._rebaseline_test(" WebKit Linux", "userscripts/another-test.html", None, "txt", None)164 165 self.assertDictEqual(self.command._scm_changes, {'add': ['/mock-checkout/LayoutTests/platform/ chromium-linux/userscripts/another-test-expected.txt'], 'delete': []})162 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", None, "txt", None) 163 164 self.assertDictEqual(self.command._scm_changes, {'add': ['/mock-checkout/LayoutTests/platform/mac-lion/userscripts/another-test-expected.txt'], 'delete': []}) 166 165 167 166 def test_rebaseline_and_copy_test(self): 168 167 self._write("userscripts/another-test-expected.txt", "generic result") 169 168 170 self.command._rebaseline_test(" WebKit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard"], "txt", None)171 172 self.assertMultiLineEqual(self._read('platform/ chromium-mac-lion/userscripts/another-test-expected.txt'), self.MOCK_WEB_RESULT)173 self.assertMultiLineEqual(self._read('platform/ chromium-mac-snowleopard/userscripts/another-test-expected.txt'), 'generic result')169 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", ["mac-lion-wk2"], "txt", None) 170 171 self.assertMultiLineEqual(self._read('platform/mac-lion/userscripts/another-test-expected.txt'), self.MOCK_WEB_RESULT) 172 self.assertMultiLineEqual(self._read('platform/mac-wk2/userscripts/another-test-expected.txt'), 'generic result') 174 173 175 174 def test_rebaseline_and_copy_test_no_existing_result(self): 176 self.command._rebaseline_test(" WebKit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard"], "txt", None)177 178 self.assertMultiLineEqual(self._read('platform/ chromium-mac-lion/userscripts/another-test-expected.txt'), self.MOCK_WEB_RESULT)179 self.assertFalse(self.tool.filesystem.exists(self._expand('platform/ chromium-mac-snowleopard/userscripts/another-test-expected.txt')))175 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", ["mac-lion-wk2"], "txt", None) 176 177 self.assertMultiLineEqual(self._read('platform/mac-lion/userscripts/another-test-expected.txt'), self.MOCK_WEB_RESULT) 178 self.assertFalse(self.tool.filesystem.exists(self._expand('platform/mac-lion-wk2/userscripts/another-test-expected.txt'))) 180 179 181 180 def test_rebaseline_and_copy_test_with_lion_result(self): 182 self._write("platform/ chromium-mac-lion/userscripts/another-test-expected.txt", "original lion result")183 184 self.command._rebaseline_test(" WebKit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard"], "txt", self.WEB_PREFIX)181 self._write("platform/mac-lion/userscripts/another-test-expected.txt", "original lion result") 182 183 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", ["mac-lion-wk2"], "txt", self.WEB_PREFIX) 185 184 186 185 self.assertItemsEqual(self.tool.web.urls_fetched, [self.WEB_PREFIX + '/userscripts/another-test-actual.txt']) 187 self.assertMultiLineEqual(self._read("platform/ chromium-mac-snowleopard/userscripts/another-test-expected.txt"), "original lion result")188 self.assertMultiLineEqual(self._read("platform/ chromium-mac-lion/userscripts/another-test-expected.txt"), self.MOCK_WEB_RESULT)186 self.assertMultiLineEqual(self._read("platform/mac-wk2/userscripts/another-test-expected.txt"), "original lion result") 187 self.assertMultiLineEqual(self._read("platform/mac-lion/userscripts/another-test-expected.txt"), self.MOCK_WEB_RESULT) 189 188 190 189 def test_rebaseline_and_copy_no_overwrite_test(self): 191 self._write("platform/ chromium-mac-lion/userscripts/another-test-expected.txt", "original lion result")192 self._write("platform/ chromium-mac-snowleopard/userscripts/another-test-expected.txt", "original snowleopardresult")193 194 self.command._rebaseline_test(" WebKit Mac10.7", "userscripts/another-test.html", ["chromium-mac-snowleopard"], "txt", None)195 196 self.assertMultiLineEqual(self._read("platform/ chromium-mac-snowleopard/userscripts/another-test-expected.txt"), "original snowleopardresult")197 self.assertMultiLineEqual(self._read("platform/ chromium-mac-lion/userscripts/another-test-expected.txt"), self.MOCK_WEB_RESULT)190 self._write("platform/mac-lion/userscripts/another-test-expected.txt", "original lion result") 191 self._write("platform/mac-lion-wk2/userscripts/another-test-expected.txt", "original lion wk2 result") 192 193 self.command._rebaseline_test("Apple Lion Release WK1 (Tests)", "userscripts/another-test.html", ["mac-lion-wk2"], "txt", None) 194 195 self.assertMultiLineEqual(self._read("platform/mac-lion-wk2/userscripts/another-test-expected.txt"), "original lion wk2 result") 196 self.assertMultiLineEqual(self._read("platform/mac-lion/userscripts/another-test-expected.txt"), self.MOCK_WEB_RESULT) 198 197 199 198 def test_rebaseline_test_internal_with_move_overwritten_baselines_to(self): … … 338 337 calls = filter(lambda x: x != ['qmake', '-v'], self.tool.executive.calls) 339 338 self.assertEqual(len(calls), 1) 340 self.assertEqual(len(calls[0]), 36)339 self.assertEqual(len(calls[0]), 22) 341 340 342 341 def test_rebaseline_expectations_noop(self):
Note: See TracChangeset
for help on using the changeset viewer.