tests/gclient_scm_test.py - Issue 11148019: Restore previous behavior of GetSha1ForSvnRev, so unit tests pass.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/gclient_scm_test.py

Issue 11148019: Restore previous behavior of GetSha1ForSvnRev, so unit tests pass. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/

Patch Set: Created 8 years, 2 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: tests/gclient_scm_test.py

===================================================================

--- tests/gclient_scm_test.py (revision 161664)

+++ tests/gclient_scm_test.py (working copy)

@@ -1096,11 +1096,12 @@

gclient_scm.scm.GIT.GetGitSvnHeadRev(cwd=self.base_path).MultipleTimes(

).AndReturn(2)

- self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'GetSha1ForSvnRev', True)

+ self.mox.StubOutWithMock(

+ gclient_scm.scm.GIT, 'GetBlessedSha1ForSvnRev', True)

# r1 -> first fake hash, r3 -> second fake hash.

- gclient_scm.scm.GIT.GetSha1ForSvnRev(cwd=self.base_path, rev='1'

+ gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='1'

).AndReturn(self.fake_hash_1)

- gclient_scm.scm.GIT.GetSha1ForSvnRev(cwd=self.base_path, rev='3'

+ gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='3'

).MultipleTimes().AndReturn(self.fake_hash_2)

# Ensure that we call git svn fetch if our LKGR is > the git-svn HEAD rev.

« no previous file with comments | « scm.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »