summaryrefslogtreecommitdiff
path: root/git/test/test_git.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2017-12-11 11:47:40 +0100
committerGitHub <noreply@github.com>2017-12-11 11:47:40 +0100
commita14277eecf65ac216dd1b756acee8c23ecdf95d9 (patch)
tree174b504a43cf8b9e88165c1effd3ca9b28945d32 /git/test/test_git.py
parent0a96030d82fa379d24b952a58eed395143950c7b (diff)
parentf48d08760552448a196fa400725cde7198e9c9b9 (diff)
downloadgitpython-a14277eecf65ac216dd1b756acee8c23ecdf95d9.tar.gz
Merge pull request #702 from yarikoptic/bf-happy-travis
BF (codename "happy travis"): trying to address lints etc to make Travis green again
Diffstat (limited to 'git/test/test_git.py')
-rw-r--r--git/test/test_git.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/test/test_git.py b/git/test/test_git.py
index 0a0d7ef7..059f90c0 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -37,6 +37,8 @@ try:
except ImportError:
import mock
+from git.compat import is_win
+
class TestGit(TestBase):
@@ -177,7 +179,8 @@ class TestGit(TestBase):
self.assertRaises(GitCommandNotFound, refresh, "yada")
# test a good path refresh
- path = os.popen("which git").read().strip()
+ which_cmd = "where" if is_win else "which"
+ path = os.popen("{0} git".format(which_cmd)).read().strip().split('\n')[0]
refresh(path)
def test_options_are_passed_to_git(self):