test, #519: No remote TCs, git-daemon cannot die@!

ankostis · ankostis · commit 6a3c95b40816 · 2016-09-28T03:35:37.000+02:00
diff --git 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
@@ -112,6 +112,7 @@ def test_with_rw_repo(self, rw_repo):
 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
@@ -26,7 +26,8 @@
 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 @@ def assert_received_message(self):
 assert self._num_progress_messages
 
 
+@skipIf(is_win(), "git-daemon proc stuck on Appveyor!")
 class TestRemote(TestBase):
 
 def tearDown(self):
@@ -407,7 +409,7 @@ def test_base(self, rw_repo, remote_repo):
 
 # 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

-Original file line number
+Diff line change
 assertnotrw_repo.config_reader("repository").getboolean("core", "bare")
 assertos.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')
 deftest_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo):
 assertnotrw_repo.config_reader("repository").getboolean("core", "bare")
-Original file line number
+Diff line change
 GitCommandError
+)
 fromgit.utilimportIterableList
 -fromgit.compatimportstring_types
 +fromgit.compatimportstring_types, is_win
 +fromunittestimportskipIf
 importtempfile
 importshutil
 importos
 assertself._num_progress_messages
 +@skipIf(is_win(), "git-daemon proc stuck on Appveyor!")
 classTestRemote(TestBase):
 deftearDown(self):
 # OPTIONS
 # cannot use 'fetch' key anymore as it is now a method
 -foroptin ("url",):
 +foroptin ("url",):
 val=getattr(remote, opt)
 reader=remote.config_reader
 assertreader.get(opt) ==val