diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2014-02-10 20:11:58 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2014-02-10 20:11:58 +0100 |
commit | 56d5d0c70cf3a914286fe016030c9edec25c3ae0 (patch) | |
tree | 8c2006f92a65c564227b6dc18f48507303fb4f79 /git/test/test_blob.py | |
parent | 0b820e617ab21b372394bf12129c30174f57c5d7 (diff) | |
parent | dbe78c02cbdfd0a539a1e04976e1480ac0daf580 (diff) | |
download | gitpython-56d5d0c70cf3a914286fe016030c9edec25c3ae0.tar.gz |
Merge branch 'feature/spaces-and-cleanup-0.3' into 0.3
* feature/spaces-and-cleanup-0.3:
Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it
Adjusted required versions of pre-requisites, now the majority of the tests work
tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) )
Diffstat (limited to 'git/test/test_blob.py')
-rw-r--r-- | git/test/test_blob.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/git/test/test_blob.py b/git/test/test_blob.py index 661c0501..6fc0287f 100644 --- a/git/test/test_blob.py +++ b/git/test/test_blob.py @@ -9,15 +9,15 @@ from git import * from gitdb.util import hex_to_bin class TestBlob(TestBase): - - def test_mime_type_should_return_mime_type_for_known_types(self): - blob = Blob(self.rorepo, **{'binsha': Blob.NULL_BIN_SHA, 'path': 'foo.png'}) - assert_equal("image/png", blob.mime_type) + + def test_mime_type_should_return_mime_type_for_known_types(self): + blob = Blob(self.rorepo, **{'binsha': Blob.NULL_BIN_SHA, 'path': 'foo.png'}) + assert_equal("image/png", blob.mime_type) - def test_mime_type_should_return_text_plain_for_unknown_types(self): - blob = Blob(self.rorepo, **{'binsha': Blob.NULL_BIN_SHA,'path': 'something'}) - assert_equal("text/plain", blob.mime_type) + def test_mime_type_should_return_text_plain_for_unknown_types(self): + blob = Blob(self.rorepo, **{'binsha': Blob.NULL_BIN_SHA,'path': 'something'}) + assert_equal("text/plain", blob.mime_type) - def test_nodict(self): - self.failUnlessRaises(AttributeError, setattr, self.rorepo.tree()['AUTHORS'], 'someattr', 2) - + def test_nodict(self): + self.failUnlessRaises(AttributeError, setattr, self.rorepo.tree()['AUTHORS'], 'someattr', 2) + |