From f77230f618722e964a76657ebb03d822b2f73518 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Mon, 10 Feb 2014 21:27:26 +0100
Subject: Basic fixes to get tests back on track. Of course there is much more
 work to be done here

---
 git/test/test_cmd.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/git/test/test_cmd.py b/git/test/test_cmd.py
index 983277be..985cdad2 100644
--- a/git/test/test_cmd.py
+++ b/git/test/test_cmd.py
@@ -7,7 +7,7 @@
 import os, sys
 from git.test.lib import (
                             TestBase, 
-                            patch_object, 
+                            patch, 
                             raises,
                             assert_equal,
                             assert_true,
@@ -19,11 +19,11 @@ from git import Git, GitCommandError
 class TestGit(TestBase):
     
     @classmethod
-    def setUpAll(cls):
-        super(TestGit, cls).setUpAll()
+    def setUp(cls):
+        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 +54,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.1