diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-01 20:42:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 20:42:27 +0200 |
| commit | 9d6b417ea3a4507ea78714f0cb7add75b13032d5 (patch) | |
| tree | 77365cb808a255eb53889725bfce775b5090330e /git/test/test_util.py | |
| parent | 4592785004ad1a4869d650dc35a1e9099245dad9 (diff) | |
| parent | 9a521681ff8614beb8e2c566cf3c475baca22169 (diff) | |
| download | gitpython-9d6b417ea3a4507ea78714f0cb7add75b13032d5.tar.gz | |
Merge pull request #519 from ankostis/appveyor
Test project on Windows with MINGW/Cygwin git (conda2.7&3.4/cpy-3.5)
Diffstat (limited to 'git/test/test_util.py')
| -rw-r--r-- | git/test/test_util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git/test/test_util.py b/git/test/test_util.py index c6ca6920..36fb5be3 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -24,7 +24,7 @@ from git.objects.util import ( parse_date, ) from git.cmd import dashify -from git.compat import string_types +from git.compat import string_types, is_win import time @@ -90,7 +90,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 # some extra time it may cost + extra_time = 0.02 + if is_win: + # for Appveyor + extra_time *= 6 # NOTE: Indeterministic failures here... + self.assertLess(elapsed, wait_time + extra_time) def test_user_id(self): assert '@' in get_user_id() |