tests/gclient_scm_test.py - Issue 910913003: Reland "Make gclient ready for the Blink (DEPS to main project)"

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 910913003: Reland "Make gclient ready for the Blink (DEPS to main project)" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Undo populateGit deflake attemp in fake_repos.py Created 5 years, 10 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

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py

index 974aff0018d5e78f40d0e80e241f548ee0a99625..967d3606edf957043c17f32a36f25d99d6d5b598 100755

--- a/tests/gclient_scm_test.py

+++ b/tests/gclient_scm_test.py

@@ -1245,6 +1245,8 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):

self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp'

self.relpath = 'fake'

self.base_path = os.path.join(self.root_dir, self.relpath)

+ self.backup_base_path = os.path.join(self.root_dir,

+ 'old_%s.git' % self.relpath)

def tearDown(self):

BaseTestCase.tearDown(self)

@@ -1354,6 +1356,7 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):

gclient_scm.os.path.isdir(

os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False)

+ gclient_scm.os.path.exists(self.backup_base_path).AndReturn(False)

gclient_scm.os.path.exists(self.base_path).AndReturn(True)

gclient_scm.os.path.isdir(self.base_path).AndReturn(True)

gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')

@@ -1384,6 +1387,7 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):