Skip to content

Commit

Permalink
Merge pull request #159 from mgedmin/fix-git-submodule-tests-using-fi…
Browse files Browse the repository at this point in the history
…le-protocol

Fix git submodule tests using file: protocol
  • Loading branch information
mgedmin committed Oct 22, 2022
2 parents d281624 + 1ce75c4 commit 7b8c279
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tests.py
Expand Up @@ -929,6 +929,7 @@ class VCSHelper:

# override in subclasses
command = None # type: Optional[str]
extra_env = {}

@property
def version(self):
Expand Down Expand Up @@ -959,7 +960,8 @@ def _run(self, *command):
command = [s.encode(locale.getpreferredencoding()) for s in command]
print('$', ' '.join(command))
p = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
stderr=subprocess.STDOUT,
env={**os.environ, **self.extra_env})
stdout, stderr = p.communicate()
rc = p.wait()
if stdout:
Expand Down Expand Up @@ -1061,6 +1063,9 @@ def test_get_vcs_files_empty(self):
class GitHelper(VCSHelper):

command = 'git'
extra_env = dict(
GIT_ALLOW_PROTOCOL='file',
)

def _init_vcs(self):
if self.version_tuple >= (2, 28):
Expand Down

0 comments on commit 7b8c279

Please sign in to comment.