| 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('')
|
|
|
|
|