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

Side by Side Diff: Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

Issue 417123006: Make webkit-patch auto-rebaseline a bit more robust to errors. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: update test result Created 6 years, 4 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
« no previous file with comments | « Tools/Scripts/webkitpy/tool/commands/rebaseline.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 1122
1123 self.assertEqual(self.tool.executive.calls, [ 1123 self.assertEqual(self.tool.executive.calls, [
1124 [ 1124 [
1125 ['python', 'echo', 'copy-existing-baselines-internal', '--su ffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-t aco.html'], 1125 ['python', 'echo', 'copy-existing-baselines-internal', '--su ffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-t aco.html'],
1126 ], 1126 ],
1127 [ 1127 [
1128 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html '], 1128 ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html '],
1129 ], 1129 ],
1130 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '-- suffixes', 'txt', 'fast/dom/prototype-taco.html']], 1130 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '-- suffixes', 'txt', 'fast/dom/prototype-taco.html']],
1131 ['git', 'cl', 'upload', '-f'], 1131 ['git', 'cl', 'upload', '-f'],
1132 ['git', 'cl', 'set_close'],
1133 ]) 1132 ])
1134 finally: 1133 finally:
1135 builders._exact_matches = old_exact_matches 1134 builders._exact_matches = old_exact_matches
1136 1135
1137 def test_execute_test_passes_everywhere(self): 1136 def test_execute_test_passes_everywhere(self):
1138 def blame(path): 1137 def blame(path):
1139 return """ 1138 return """
1140 6469e754a1 path/to/TestExpectations (foobarbaz1@chromium.org 2 013-04-28 04:52:41 +0000 13) Bug(foo) fast/dom/prototype-taco.html [ NeedsReba seline ] 1139 6469e754a1 path/to/TestExpectations (foobarbaz1@chromium.org 2 013-04-28 04:52:41 +0000 13) Bug(foo) fast/dom/prototype-taco.html [ NeedsReba seline ]
1141 """ 1140 """
1142 self.tool.scm().blame = blame 1141 self.tool.scm().blame = blame
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 oc.capture_output() 1236 oc.capture_output()
1238 self.command._do_one_rebaseline() 1237 self.command._do_one_rebaseline()
1239 out, _, _ = oc.restore_output() 1238 out, _, _ = oc.restore_output()
1240 1239
1241 self.assertEqual(out, 'MOCK STDOUT\n') 1240 self.assertEqual(out, 'MOCK STDOUT\n')
1242 self.assertEqual(self.tool.executive.calls, [ 1241 self.assertEqual(self.tool.executive.calls, [
1243 ['git', 'pull'], 1242 ['git', 'pull'],
1244 ['/mock-checkout/third_party/WebKit/Tools/Scripts/webkit-patch', 'au to-rebaseline', '--verbose'], 1243 ['/mock-checkout/third_party/WebKit/Tools/Scripts/webkit-patch', 'au to-rebaseline', '--verbose'],
1245 ]) 1244 ])
1246 self.assertEqual(self._logs, ['MOCK STDOUT']) 1245 self.assertEqual(self._logs, ['MOCK STDOUT'])
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/tool/commands/rebaseline.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698