commit 6d8115d009a9f58c7447eabe209aeb6d396d0245
author szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Apr 23 20:59:23 2014 +0000
committer szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Apr 23 20:59:23 2014 +0000
tree 8fa8a14faaf3e3b75cdb071e3fc09b0d2ec4f368
parent a2aec97d74e64ef94f55eba445200b423bd49977

Eliminate all interactive terminal prompts from git.

BUG=

Review URL: https://codereview.chromium.org/247493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265735 0039d316-1c4b-4281-b951-d872f2087c98

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index dbd94f0..370e75f 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1308,13 +1308,13 @@
     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('')
 
@@ -1342,13 +1342,13 @@
                                   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('')