From 082851e0afd3a58790fe3c2434f6d070f97c69c1 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Sun, 25 Sep 2016 18:55:15 +0200 Subject: apveyor: simplify test. --- git/test/test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/test/test_util.py') diff --git a/git/test/test_util.py b/git/test/test_util.py index c6ca6920..a47697c0 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -90,7 +90,7 @@ 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 + assert elapsed <= wait_time + 0.02, elapsed # some extra time it may cost def test_user_id(self): assert '@' in get_user_id() -- cgit v1.2.1 From 7bbaac26906863b9a09158346218457befb2821a Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Mon, 26 Sep 2016 12:32:28 +0200 Subject: 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. --- git/test/test_util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'git/test/test_util.py') 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() -- cgit v1.2.1 From f495e94028bfddc264727ffc464cd694ddd05ab8 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Mon, 26 Sep 2016 20:41:41 +0200 Subject: src, #519: collect all is_() calls --- git/test/test_util.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'git/test/test_util.py') diff --git a/git/test/test_util.py b/git/test/test_util.py index 2e53df50..76a5e0e9 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -24,10 +24,9 @@ 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 -import sys class TestIterableMember(object): @@ -93,7 +92,7 @@ class TestUtils(TestBase): elapsed = time.time() - start # More extra time costs, but... extra_time = 0.2 - if sys.platform == 'win32': + if is_win(): extra_time *= 4 self.assertLess(elapsed, wait_time + 0.02) -- cgit v1.2.1 From e61439b3018b0b9a8eb43e59d0d7cf32041e2fed Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Tue, 27 Sep 2016 16:05:58 +0200 Subject: src: constify is_() calls + TCs: unittest-asserts for git-tests. --- git/test/test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/test/test_util.py') diff --git a/git/test/test_util.py b/git/test/test_util.py index 76a5e0e9..9fc159df 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -92,7 +92,7 @@ class TestUtils(TestBase): elapsed = time.time() - start # More extra time costs, but... extra_time = 0.2 - if is_win(): + if is_win: extra_time *= 4 self.assertLess(elapsed, wait_time + 0.02) -- cgit v1.2.1 From 44c6d0b368bc1ec6cd0a97b01678b38788c9bd9c Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Wed, 28 Sep 2016 05:46:50 +0200 Subject: Proc, #519: Rework error-exc msgs & log thread-pumps errors + No WindowsError exception. + Add `test_exc.py` for unicode issues. + Single-arg for decoding-streams in pump-func. --- git/test/test_util.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'git/test/test_util.py') diff --git a/git/test/test_util.py b/git/test/test_util.py index 9fc159df..eae9fbc7 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -90,10 +90,9 @@ class TestUtils(TestBase): wait_lock = BlockingLockFile(my_file, 0.05, wait_time) self.failUnlessRaises(IOError, wait_lock._obtain_lock) elapsed = time.time() - start - # More extra time costs, but... extra_time = 0.2 if is_win: - extra_time *= 4 + extra_time *= 6 # NOTE: Indeterministic failures here... self.assertLess(elapsed, wait_time + 0.02) def test_user_id(self): -- cgit v1.2.1 From 395955609dfd711cc4558e2b618450f3514b28c1 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Thu, 29 Sep 2016 01:07:41 +0200 Subject: FIX hook TC on PY3+Win & indeterministic lock timing. + Cannot `index.path` into ENV, it is bytes! + The hook TC never runs on linux! + Unblock removal of odbfile in perf-large streams TC. + Attempt to unblock removal of submodule file by intensive cleaning. more unblock files --- git/test/test_util.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'git/test/test_util.py') diff --git a/git/test/test_util.py b/git/test/test_util.py index eae9fbc7..36fb5be3 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -90,10 +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 - extra_time = 0.2 + extra_time = 0.02 if is_win: + # for Appveyor extra_time *= 6 # NOTE: Indeterministic failures here... - self.assertLess(elapsed, wait_time + 0.02) + self.assertLess(elapsed, wait_time + extra_time) def test_user_id(self): assert '@' in get_user_id() -- cgit v1.2.1