From 74c7ed0e809d6f3d691d8251c70f9a5dab5fb18d Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Tue, 11 Oct 2016 13:06:02 +0200 Subject: FIX #526: Do not depend on test-sources + Move `HIDE_WINDOWS_KNOWN_ERRORS` flag from `git.test.lib.helper-->git.util`; regular modules in main-sources folder also depend on that flag. + Use unittest.SkipTest instead of from non-standard `nose` lib. --- git/test/lib/helper.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'git/test/lib') diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index e92ce8b4..092068b9 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -31,11 +31,6 @@ __all__ = ( log = logging.getLogger('git.util') -#: We need an easy way to see if Appveyor TCs start failing, -#: so the errors marked with this var are considered "acknowledged" ones, awaiting remedy, -#: till then, we wish to hide them. -HIDE_WINDOWS_KNOWN_ERRORS = is_win and os.environ.get('HIDE_WINDOWS_KNOWN_ERRORS', True) - #{ Routines @@ -289,7 +284,7 @@ def with_rw_and_rw_remote_repo(working_tree_ref): You can also run the daemon on a different port by passing --port=" and setting the environment variable GIT_PYTHON_TEST_GIT_DAEMON_PORT to """ % temp_dir) - from nose import SkipTest + from unittest import SkipTest raise SkipTest(msg) if is_win else AssertionError(msg) # END make assertion # END catch ls remote error -- cgit v1.2.3