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

Unified Diff: tests/gclient_scm_test.py

Issue 247493002: Eliminate all interactive terminal prompts from git. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: fix scm_unittest.py Created 6 years, 8 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 | « scm.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_scm_test.py
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index c49b5247e449bc82be3499de94c9564c442ae5ff..fcaf4c5a7cf6a6b603dad1dfb143de84584e37d1 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1306,13 +1306,13 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):
gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url,
options)
self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True)
- gclient_scm.subprocess2.check_output(['git', 'ls-files'],
- cwd=self.base_path,
- stderr=-1,
- ).AndReturn('')
+ gclient_scm.subprocess2.check_output(
+ ['git', 'ls-files'], cwd=self.base_path,
+ env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('')
gclient_scm.subprocess2.check_output(
['git', 'rev-parse', '--verify', 'HEAD'],
cwd=self.base_path,
+ env=gclient_scm.scm.GIT.ApplyEnvVars({}),
stderr=-1,
).AndReturn('')
@@ -1338,13 +1338,13 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):
options)
# pylint: disable=E1120
self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True)
- gclient_scm.subprocess2.check_output(['git', 'ls-files'],
- cwd=self.base_path,
- stderr=-1,
- ).AndReturn('')
+ gclient_scm.subprocess2.check_output(
+ ['git', 'ls-files'], cwd=self.base_path,
+ env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('')
gclient_scm.subprocess2.check_output(
['git', 'rev-parse', '--verify', 'HEAD'],
cwd=self.base_path,
+ env=gclient_scm.scm.GIT.ApplyEnvVars({}),
stderr=-1,
).AndReturn('')
« no previous file with comments | « scm.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698