From dbe78c02cbdfd0a539a1e04976e1480ac0daf580 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 10 Feb 2014 19:59:56 +0100 Subject: Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it --- git/test/test_repo.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'git/test/test_repo.py') diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 6b6fdb4a..9770d97c 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -3,7 +3,15 @@ # # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -from git.test.lib import * +from git.test.lib import (patch, + TestBase, + with_rw_repo, + fixture, + GIT_REPO, + assert_false, + assert_equal, + assert_true, + raises) from git import * from git.util import join_path_native from git.exc import BadObject @@ -242,7 +250,7 @@ class TestRepo(TestBase): self.rorepo.archive(tmpfile, '0.1.5') assert tmpfile.tell() - @patch_object(Git, '_call_process') + @patch.object(Git, '_call_process') def test_should_display_blame_information(self, git): git.return_value = fixture('blame') b = self.rorepo.blame( 'master', 'lib/git.py') -- cgit v1.2.1