summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. King III <jking@apache.org>2019-05-05 15:04:31 -0400
committerJames E. King III <jking@apache.org>2019-05-05 16:19:32 -0400
commit11fd713f77bb0bc817ff3c17215fd7961c025d7e (patch)
tree2072cdfd9f4cf4de2f540e84749bc46ca9e9eecc
parent52ee33ac9b234c7501d97b4c2bf2e2035c5ec1fa (diff)
downloadgitpython-11fd713f77bb0bc817ff3c17215fd7961c025d7e.tar.gz
Resolve test incompatibility with git v2.21.0
This fixes #869
-rwxr-xr-xdockernose.sh2
-rw-r--r--git/test/test_remote.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/dockernose.sh b/dockernose.sh
index 0f741967..c9227118 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 f3a214cb..99949b9e 100644
--- a/git/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -638,7 +638,7 @@ class TestRemote(TestBase):
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)