diff options
Diffstat (limited to 'git/test')
| -rw-r--r-- | git/test/test_base.py | 3 | ||||
| -rw-r--r-- | git/test/test_git.py | 2 | ||||
| -rw-r--r-- | git/test/test_util.py | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/git/test/test_base.py b/git/test/test_base.py index c17e04e7..22006470 100644 --- a/git/test/test_base.py +++ b/git/test/test_base.py @@ -7,6 +7,7 @@ import os import sys import tempfile +from unittest import skipIf import git.objects.base as base from git.test.lib import ( @@ -116,6 +117,8 @@ class TestBase(TestBase): assert rw_remote_repo.config_reader("repository").getboolean("core", "bare") assert os.path.isdir(os.path.join(rw_repo.working_tree_dir, 'lib')) + @skipIf(sys.version_info < (3, ) and os.name == 'nt', + "Unicode woes, see https://github.com/gitpython-developers/GitPython/pull/519") @with_rw_repo('0.1.6') def test_add_unicode(self, rw_repo): filename = u"שלום.txt" diff --git a/git/test/test_git.py b/git/test/test_git.py index f8318595..935673b1 100644 --- a/git/test/test_git.py +++ b/git/test/test_git.py @@ -239,6 +239,8 @@ class TestGit(TestBase): stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False, + universal_newlines=True, + creationflags=Git.CREATE_NO_WINDOW if sys.platform == 'win32' else 0, ) handle_process_output(proc, counter_stdout, counter_stderr, lambda proc: proc.wait()) diff --git a/git/test/test_util.py b/git/test/test_util.py index a47697c0..2e53df50 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -27,6 +27,7 @@ from git.cmd import dashify from git.compat import string_types import time +import sys class TestIterableMember(object): @@ -90,7 +91,11 @@ class TestUtils(TestBase): wait_lock = BlockingLockFile(my_file, 0.05, wait_time) self.failUnlessRaises(IOError, wait_lock._obtain_lock) elapsed = time.time() - start - assert elapsed <= wait_time + 0.02, elapsed # some extra time it may cost + # More extra time costs, but... + extra_time = 0.2 + if sys.platform == 'win32': + extra_time *= 4 + self.assertLess(elapsed, wait_time + 0.02) def test_user_id(self): assert '@' in get_user_id() |