| Index: Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| index 96f06c34bfd32c78281ce8433a9adc73710e5810..257d16965fe4129846852c2048329b1678bc9a42 100644
|
| --- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| +++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
|
| @@ -983,7 +983,7 @@ TBR=foo@chromium.org
|
| self.tool.scm().blame = blame
|
|
|
| self.command.execute(MockOptions(optimize=True, verbose=False, move_overwritten_baselines=False, results_directory=False), [], self.tool)
|
| - self.assertEqual(self.tool.executive.calls, [])
|
| + self.assertEqual(self.tool.executive.calls, [['git', 'auto-svn']])
|
|
|
| def test_execute(self):
|
| def blame(path):
|
| @@ -1055,13 +1055,15 @@ crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
|
|
|
| self.command.tree_status = lambda: 'closed'
|
| self.command.execute(MockOptions(optimize=True, verbose=False, move_overwritten_baselines=False, results_directory=False), [], self.tool)
|
| - self.assertEqual(self.tool.executive.calls, [])
|
| + self.assertEqual(self.tool.executive.calls, [['git', 'auto-svn']])
|
|
|
| self.command.tree_status = lambda: 'open'
|
| self.tool.executive.calls = []
|
| self.command.execute(MockOptions(optimize=True, verbose=False, move_overwritten_baselines=False, results_directory=False), [], self.tool)
|
|
|
| self.assertEqual(self.tool.executive.calls, [
|
| + ['git', 'auto-svn'],
|
| + ['git', 'rev-parse', '--symbolic-full-name', 'HEAD'],
|
| [
|
| ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png', '--builder', 'MOCK Leopard', '--test', 'fast/dom/prototype-chocolate.html'],
|
| ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-strawberry.html'],
|
| @@ -1145,6 +1147,8 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
|
| self.command.execute(MockOptions(optimize=True, verbose=False, move_overwritten_baselines=False, results_directory=False), [], self.tool)
|
|
|
| self.assertEqual(self.tool.executive.calls, [
|
| + ['git', 'auto-svn'],
|
| + ['git', 'rev-parse', '--symbolic-full-name', 'HEAD'],
|
| [
|
| ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
|
| ],
|
| @@ -1204,6 +1208,8 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
|
| self.command.tree_status = lambda: 'open'
|
| self.command.execute(MockOptions(optimize=True, verbose=False, move_overwritten_baselines=False, results_directory=False), [], self.tool)
|
| self.assertEqual(self.tool.executive.calls, [
|
| + ['git', 'auto-svn'],
|
| + ['git', 'rev-parse', '--symbolic-full-name', 'HEAD'],
|
| [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', '', 'fast/dom/prototype-taco.html']],
|
| ['git', 'cl', 'upload', '-f'],
|
| ['git', 'pull'],
|
|
|