rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix TestGitStrSubprocess.test_real_git on Windows.

Browse Source 
Fixes #939.
This commit is contained in:
Florian Bruhin 2015-10-02 07:36:06 +02:00
parent 93ed853c36
commit 5c52d4d04e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/unit/utils/test_version.py
View File

@ -179,16 +179,25 @@ class TestGitStrSubprocess:
""" """
def _git(*args): def _git(*args):
"""Helper closure to call git.""" """Helper closure to call git."""
env = { env = os.environ.copy()
env.update({
'GIT_AUTHOR_NAME': 'qutebrowser testsuite', 'GIT_AUTHOR_NAME': 'qutebrowser testsuite',
'GIT_AUTHOR_EMAIL': 'mail@qutebrowser.org', 'GIT_AUTHOR_EMAIL': 'mail@qutebrowser.org',
'GIT_AUTHOR_DATE': 'Thu 1 Jan 01:00:00 CET 1970', 'GIT_AUTHOR_DATE': 'Thu 1 Jan 01:00:00 CET 1970',
'GIT_COMMITTER_NAME': 'qutebrowser testsuite', 'GIT_COMMITTER_NAME': 'qutebrowser testsuite',
'GIT_COMMITTER_EMAIL': 'mail@qutebrowser.org', 'GIT_COMMITTER_EMAIL': 'mail@qutebrowser.org',
'GIT_COMMITTER_DATE': 'Thu 1 Jan 01:00:00 CET 1970', 'GIT_COMMITTER_DATE': 'Thu 1 Jan 01:00:00 CET 1970',
} })
subprocess.check_call(['git', '-C', str(tmpdir)] + list(args), if os.name == 'nt':
env=env) # If we don't call this with shell=True it might fail under
# some environments on Windows...
# http://bugs.python.org/issue24493
subprocess.check_call(
'git -C "{}" {}'.format(tmpdir, ' '.join(args)),
env=env, shell=True)
else:
subprocess.check_call(
['git', '-C', str(tmpdir)] + list(args), env=env)
(tmpdir / 'file').write_text("Hello World!", encoding='utf-8') (tmpdir / 'file').write_text("Hello World!", encoding='utf-8')
_git('init') _git('init')