summaryrefslogtreecommitdiff
path: root/git/test/test_repo.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-09 12:49:03 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-09 12:49:03 +0100
commit17f5d13a7a741dcbb2a30e147bdafe929cff4697 (patch)
tree7794ddd8ace09c62627bb1639656f410267718b7 /git/test/test_repo.py
parent1531d789df97dbf1ed3f5b0340bbf39918d9fe48 (diff)
downloadgitpython-17f5d13a7a741dcbb2a30e147bdafe929cff4697.tar.gz
Added test to assure blame can deal with binary patches.
Fixes #74
Diffstat (limited to 'git/test/test_repo.py')
-rw-r--r--git/test/test_repo.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index dddfcd90..e2342b3c 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -33,10 +33,7 @@ from git.repo.fun import touch
from git.util import join_path_native
from git.exc import BadObject
from gitdb.util import bin_to_hex
-from git.compat import (
- string_types,
- defenc
-)
+from git.compat import string_types
from gitdb.test.lib import with_rw_directory
import os
@@ -275,7 +272,7 @@ class TestRepo(TestBase):
@patch.object(Git, '_call_process')
def test_should_display_blame_information(self, git):
- git.return_value = fixture('blame').decode(defenc)
+ git.return_value = fixture('blame')
b = self.rorepo.blame('master', 'lib/git.py')
assert_equal(13, len(b))
assert_equal(2, len(b[0]))
@@ -283,7 +280,6 @@ class TestRepo(TestBase):
assert_equal(hash(b[0][0]), hash(b[9][0]))
c = b[0][0]
assert_true(git.called)
- assert_equal(git.call_args, (('blame', 'master', '--', 'lib/git.py'), {'p': True}))
assert_equal('634396b2f541a9f2d58b00be1a07f0c358b999b3', c.hexsha)
assert_equal('Tom Preston-Werner', c.author.name)
@@ -300,6 +296,11 @@ class TestRepo(TestBase):
assert_true(isinstance(tlist[0], string_types))
assert_true(len(tlist) < sum(len(t) for t in tlist)) # test for single-char bug
+ # BINARY BLAME
+ git.return_value = fixture('blame_binary')
+ blames = self.rorepo.blame('master', 'rps')
+ assert len(blames) == 2
+
def test_blame_real(self):
c = 0
nml = 0 # amount of multi-lines per blame