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

Unified Diff: Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

Issue 1235353002: Fix resolution of local branch name in scm and rebaseline tools. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: convert HEAD to empty string Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Tools/Scripts/webkitpy/tool/commands/rebaseline.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4216a7eb089756ea2bb3b08de6f9be105d2c8163..4e66278de7c888919e2712e3638e21d2741cd290 100644
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
@@ -1079,7 +1079,6 @@ crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
self.assertEqual(self.tool.executive.calls, [
self.SVN_REMOTE_CMD,
- ['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'],
@@ -1167,7 +1166,6 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
self.assertEqual(self.tool.executive.calls, [
self.SVN_REMOTE_CMD,
- ['git', 'rev-parse', '--symbolic-full-name', 'HEAD'],
[
['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
],
@@ -1229,7 +1227,6 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
self.assertEqual(self.tool.executive.calls, [
self.SVN_REMOTE_CMD,
- ['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'],
@@ -1293,7 +1290,6 @@ Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
self.assertEqual(self.tool.executive.calls, [
self.SVN_REMOTE_CMD,
['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'],
« 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