diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-09-26 23:20:58 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-09-28 03:35:37 +0200 |
| commit | 6a3c95b408162c78b9a4230bb4f7274a94d0add4 (patch) | |
| tree | a83a13c16b5b6dce5a03a9483bd465087d20ba20 /git | |
| parent | 618e6259ef03a4b25415bae31a7540ac5eb2e38a (diff) | |
| download | gitpython-6a3c95b408162c78b9a4230bb4f7274a94d0add4.tar.gz | |
test, #519: No remote TCs, git-daemon cannot die@!
Diffstat (limited to 'git')
| -rw-r--r-- | git/test/test_base.py | 1 | ||||
| -rw-r--r-- | git/test/test_remote.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/git/test/test_base.py b/git/test/test_base.py index cf92997f..f139798b 100644 --- a/git/test/test_base.py +++ b/git/test/test_base.py @@ -112,6 +112,7 @@ class TestBase(TestBase): assert not rw_repo.config_reader("repository").getboolean("core", "bare") assert os.path.isdir(os.path.join(rw_repo.working_tree_dir, 'lib')) + @skipIf(is_win(), "git-daemon proc stuck on Appveyor!") @with_rw_and_rw_remote_repo('0.1.6') def test_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo): assert not rw_repo.config_reader("repository").getboolean("core", "bare") diff --git a/git/test/test_remote.py b/git/test/test_remote.py index 70c4a596..0060b5a6 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -26,7 +26,8 @@ from git import ( GitCommandError ) from git.util import IterableList -from git.compat import string_types +from git.compat import string_types, is_win +from unittest import skipIf import tempfile import shutil import os @@ -99,6 +100,7 @@ class TestRemoteProgress(RemoteProgress): assert self._num_progress_messages +@skipIf(is_win(), "git-daemon proc stuck on Appveyor!") class TestRemote(TestBase): def tearDown(self): @@ -407,7 +409,7 @@ class TestRemote(TestBase): # OPTIONS # cannot use 'fetch' key anymore as it is now a method - for opt in ("url", ): + for opt in ("url",): val = getattr(remote, opt) reader = remote.config_reader assert reader.get(opt) == val |