diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-09-26 12:32:28 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-09-26 20:53:48 +0200 |
| commit | 7bbaac26906863b9a09158346218457befb2821a (patch) | |
| tree | 974f70d101ce4613aecaf793b2b82e72b96cc56c /git/test/test_util.py | |
| parent | fa70623a651d2a0b227202cad1e526e3eeebfa00 (diff) | |
| download | gitpython-7bbaac26906863b9a09158346218457befb2821a.tar.gz | |
test, #519: Popen() universal_newlin.es NoWindow in Winfoes
+ More win-fixes:
+ Do not check unicode files in < py3.
+ util, #519: x4 timeout of lock-file blocking, failing in Appveyor.
Diffstat (limited to 'git/test/test_util.py')
| -rw-r--r-- | git/test/test_util.py | 7 |
1 files changed, 6 insertions, 1 deletions
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() |