From dbe78c02cbdfd0a539a1e04976e1480ac0daf580 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
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_git.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'git/test/test_git.py')

diff --git a/git/test/test_git.py b/git/test/test_git.py
index 5b0cbfee..b61a0eea 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -5,25 +5,24 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import os, sys
-from git.test.lib import (
-                            TestBase, 
-                            patch_object, 
+from git.test.lib import (  TestBase,
+                            patch, 
                             raises,
                             assert_equal,
                             assert_true,
                             assert_match,
-                            fixture_path
-                        )
-from git import Git, GitCommandError
+                            fixture_path )
+from git import (   Git,
+                    GitCommandError )
 
 class TestGit(TestBase):
     
     @classmethod
     def setUp(cls):
-        super(TestGit, cls).setUpAll()
+        super(TestGit, cls).setUp()
         cls.git = Git(cls.rorepo.working_dir)
 
-    @patch_object(Git, 'execute')
+    @patch.object(Git, 'execute')
     def test_call_process_calls_execute(self, git):
         git.return_value = ''
         self.git.version()
@@ -54,7 +53,7 @@ class TestGit(TestBase):
                      self.git.hash_object(istream=fh, stdin=True))
         fh.close()
 
-    @patch_object(Git, 'execute')
+    @patch.object(Git, 'execute')
     def test_it_ignores_false_kwargs(self, git):
         # this_should_not_be_ignored=False implies it *should* be ignored
         output = self.git.version(pass_this_kwarg=False)
-- 
cgit v1.2.3