summaryrefslogtreecommitdiff
path: root/git/test/test_remote.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-04-22 07:59:47 +0200
committerSebastian Thiel <byronimo@gmail.com>2015-04-22 07:59:47 +0200
commite39c8b07d1c98ddf267fbc69649ecbbe043de0fd (patch)
treee22cf0e02dacafafc1f2c2972e19ffb1d83ddd89 /git/test/test_remote.py
parent5fe80b03196b1d2421109fad5b456ba7ae4393e2 (diff)
parentc1cedc5c417ddf3c2a955514dcca6fe74913259b (diff)
downloadgitpython-e39c8b07d1c98ddf267fbc69649ecbbe043de0fd.tar.gz
Merge pull request #284 from moben/test-fixes
git-daemon test fixes
Diffstat (limited to 'git/test/test_remote.py')
-rw-r--r--git/test/test_remote.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/git/test/test_remote.py b/git/test/test_remote.py
index c419ecee..af854988 100644
--- a/git/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -8,7 +8,8 @@ from git.test.lib import (
TestBase,
with_rw_repo,
with_rw_and_rw_remote_repo,
- fixture
+ fixture,
+ GIT_DAEMON_PORT
)
from git import (
RemoteProgress,
@@ -250,7 +251,7 @@ class TestRemote(TestBase):
# must clone with a local path for the repo implementation not to freak out
# as it wants local paths only ( which I can understand )
other_repo = remote_repo.clone(other_repo_dir, shared=False)
- remote_repo_url = "git://localhost%s" % remote_repo.git_dir
+ remote_repo_url = "git://localhost:%s%s" % (GIT_DAEMON_PORT, remote_repo.git_dir)
# put origin to git-url
other_origin = other_repo.remotes.origin