summaryrefslogtreecommitdiff
path: root/git/test/test_repo.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-09-26 11:08:57 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-09-26 20:20:58 +0200
commitfa70623a651d2a0b227202cad1e526e3eeebfa00 (patch)
tree0fdb7195e73f8e26baa155f1651e5303dcb41877 /git/test/test_repo.py
parent7ec2f8a4f26cec3fbbe1fb447058acaf508b39c0 (diff)
downloadgitpython-fa70623a651d2a0b227202cad1e526e3eeebfa00.tar.gz
test, #519: FIX appveyor conda & failures in py2.6 `assertRaisesRegexp`
Diffstat (limited to 'git/test/test_repo.py')
-rw-r--r--git/test/test_repo.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index abc4a704..b516402a 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -110,7 +110,7 @@ class TestRepo(TestBase):
# try from invalid revision that does not exist
self.failUnlessRaises(BadName, self.rorepo.tree, 'hello world')
-
+
def test_pickleable(self):
pickle.loads(pickle.dumps(self.rorepo))
@@ -318,6 +318,9 @@ class TestRepo(TestBase):
@patch.object(Git, '_call_process')
def test_should_display_blame_information(self, git):
+ if sys.version_info < (2, 7):
+ ## Skipped, not `assertRaisesRegexp` in py2.6
+ return
git.return_value = fixture('blame')
b = self.rorepo.blame('master', 'lib/git.py')
assert_equal(13, len(b))