diff options
| -rw-r--r-- | .appveyor.yml | 3 | ||||
| -rw-r--r-- | git/test/test_base.py | 1 | ||||
| -rw-r--r-- | git/test/test_remote.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index b19f091f..fefd9478 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ install: - | uname -a where git - where python pip pip2 pip3 pip34 pip35 pip36 + where python pip python --version python -c "import struct; print(struct.calcsize('P') * 8)" @@ -66,7 +66,6 @@ build: false test_script: - nosetests -v - - echo OK #on_success: # - IF "%PYTHON_VERSION%"=="3.4" (coveralls) 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 |