summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-09-25 17:17:27 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-09-25 17:17:27 +0200
commit0de60abc5eb71eff14faa0169331327141a5e855 (patch)
tree58fb0b878914d6da30006412d34cf7e059a74e5b
parentd6b1a9272455ef80f01a48ea22efc85b7f976503 (diff)
downloadgitpython-0de60abc5eb71eff14faa0169331327141a5e855.tar.gz
fix(test): deal with py2 and py3
It ain't pretty, but should do the job. Related to #514
-rw-r--r--git/test/test_index.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/test/test_index.py b/git/test/test_index.py
index bce56089..178a59d2 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -145,7 +145,9 @@ class TestIndex(TestBase):
## 1st fail on purpose adding into index.
add_bad_blob()
except Exception as ex:
- assert "cannot convert argument to integer" in str(ex)
+ msg_py3 = "required argument is not an integer"
+ msg_py2 = "cannot convert argument to integer"
+ assert msg_py2 in str(ex) or msg_py3 in str(ex)
## 2nd time should not fail due to stray lock file
try: