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

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

Issue 1379493002: Use chromium revision instead of blink svn revision when rebaselining layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove multiple repo support Created 5 years, 3 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
Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
index 1542127faf3d628a7be3c809bfdd881af703172a..9601bd9095c6bbca2b8e36c73ac97e84700d2ccf 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py
@@ -340,11 +340,6 @@ class GitTest(SCMTestBase):
self._chdir(self.untracking_checkout_path)
self.assertRaises(ScriptError, self.untracking_scm._remote_branch_ref)
- def test_multiple_remotes(self):
- self._run(['git', 'config', '--add', 'svn-remote.svn.fetch', 'trunk:remote1'])
- self._run(['git', 'config', '--add', 'svn-remote.svn.fetch', 'trunk:remote2'])
- self.assertEqual(self.tracking_scm._remote_branch_ref(), 'remote1')
-
def test_create_patch(self):
self._write_text_file('test_file_commit1', 'contents')
self._run(['git', 'add', 'test_file_commit1'])
@@ -363,6 +358,23 @@ class GitTest(SCMTestBase):
scm.move('foo_file', 'bar_file')
scm.commit_locally_with_message('message')
+ def test_commit_position_from_git_log(self):
+ git_log = """
+commit 624c3081c0
+Author: foobarbaz1 <foobarbaz1@chromium.org>
+Date: Mon Sep 28 19:10:30 2015 -0700
+
+ Test foo bar baz qux 123.
+
+ BUG=000000
+
+ Review URL: https://codereview.chromium.org/999999999
+
+ Cr-Commit-Position: refs/heads/master@{#1234567}
+"""
+ scm = self.tracking_scm
+ self.assertEqual(scm._commit_position_from_git_log(git_log), 1234567)
+
class GitSVNTest(SCMTestBase):
def setUp(self):

Powered by Google App Engine
This is Rietveld 408576698