From 27ad4dcfe8a002c0f38aad1e069869a6fb84244a Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Sun, 5 May 2019 15:04:31 -0400 Subject: [PATCH] Resolve test incompatibility with git v2.21.0 This fixes #869 --- dockernose.sh | 2 ++ git/test/test_remote.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dockernose.sh b/dockernose.sh index 0f7419674..c9227118a 100755 --- a/dockernose.sh +++ b/dockernose.sh @@ -4,5 +4,7 @@ if [ -z "${PYVER}" ]; then PYVER=py37 fi +# remember to use "-s" if you inject pdb.set_trace() as this disables nosetests capture of streams + tox -e ${PYVER} --notest PYTHONPATH=/src/.tox/${PYVER}/lib/python*/site-packages /src/.tox/${PYVER}/bin/nosetests --pdb $* diff --git a/git/test/test_remote.py b/git/test/test_remote.py index f3a214cbb..99949b9ea 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -638,7 +638,7 @@ def test_multiple_urls(self, rw_repo): def test_fetch_error(self): rem = self.rorepo.remote('origin') - with self.assertRaisesRegex(GitCommandError, "Couldn't find remote ref __BAD_REF__"): + with self.assertRaisesRegex(GitCommandError, "[Cc]ouldn't find remote ref __BAD_REF__"): rem.fetch('__BAD_REF__') @with_rw_repo('0.1.6', bare=False)