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

Side by Side Diff: sky/tools/webkitpy/tool/commands/rebaseline_unittest.py

Issue 639883003: Get test_webkitpy to actually run again. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 1 month 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
« no previous file with comments | « sky/tools/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 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1239 self.command._post_log_to_server = self._mock_log_to_server 1239 self.command._post_log_to_server = self._mock_log_to_server
1240 1240
1241 oc = OutputCapture() 1241 oc = OutputCapture()
1242 oc.capture_output() 1242 oc.capture_output()
1243 self.command._do_one_rebaseline() 1243 self.command._do_one_rebaseline()
1244 out, _, _ = oc.restore_output() 1244 out, _, _ = oc.restore_output()
1245 1245
1246 self.assertEqual(out, '') 1246 self.assertEqual(out, '')
1247 self.assertEqual(self.tool.executive.calls, [ 1247 self.assertEqual(self.tool.executive.calls, [
1248 ['git', 'pull'], 1248 ['git', 'pull'],
1249 ['/mock-checkout/third_party/WebKit/Tools/Scripts/webkit-patch', 'au to-rebaseline'], 1249 ['/mock-checkout/third_party/WebKit/tools/webkit-patch', 'auto-rebas eline'],
1250 ]) 1250 ])
1251 self.assertEqual(self._logs, ['MOCK STDOUT']) 1251 self.assertEqual(self._logs, ['MOCK STDOUT'])
1252 1252
1253 def test_do_one_rebaseline_verbose(self): 1253 def test_do_one_rebaseline_verbose(self):
1254 self.command._verbose = True 1254 self.command._verbose = True
1255 self.command._post_log_to_server = self._mock_log_to_server 1255 self.command._post_log_to_server = self._mock_log_to_server
1256 1256
1257 oc = OutputCapture() 1257 oc = OutputCapture()
1258 oc.capture_output() 1258 oc.capture_output()
1259 self.command._do_one_rebaseline() 1259 self.command._do_one_rebaseline()
1260 out, _, _ = oc.restore_output() 1260 out, _, _ = oc.restore_output()
1261 1261
1262 self.assertEqual(out, 'MOCK STDOUT\n') 1262 self.assertEqual(out, 'MOCK STDOUT\n')
1263 self.assertEqual(self.tool.executive.calls, [ 1263 self.assertEqual(self.tool.executive.calls, [
1264 ['git', 'pull'], 1264 ['git', 'pull'],
1265 ['/mock-checkout/third_party/WebKit/Tools/Scripts/webkit-patch', 'au to-rebaseline', '--verbose'], 1265 ['/mock-checkout/third_party/WebKit/tools/webkit-patch', 'auto-rebas eline', '--verbose'],
1266 ]) 1266 ])
1267 self.assertEqual(self._logs, ['MOCK STDOUT']) 1267 self.assertEqual(self._logs, ['MOCK STDOUT'])
OLDNEW
« no previous file with comments | « sky/tools/webkitpy/tool/commands/rebaseline.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698