Basic fixes to get tests back on track. Of course there is much more work to be done here

10 files changed, 22 insertions, 18 deletions

diff --git a/.gitmodules b/.gitmodules
index 7ad13154..95c6a160 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "async"]
 	path = git/ext/async
 	url = http://github.com/gitpython-developers/async.git
+	branch = master
 [submodule "smmap"]
 	path = git/ext/smmap
 	url = http://github.com/Byron/smmap.git 
+	branch = master
diff --git a/README.rst b/README.rst
index 11fa8cca..52ada5cd 100644
--- a/README.rst
+++ b/README.rst
@@ -11,9 +11,11 @@ The object database implementation is optimized for handling large quantities of
 REQUIREMENTS
 ============
 
-* Git ( tested with 1.7.3.2 )
+* Git ( tested with 1.8.3.4 )
 * Python Nose - used for running the tests
-* Mock by Michael Foord used for tests. Requires 0.5
+ * Tested with nose 1.3.0
+* Mock by Michael Foord used for tests
+ * Tested with 1.0.1
 
 INSTALL
 =======
diff --git a/git/ext/async b/git/ext/async
-Subproject 10310824c001deab8fea85b88ebda0696f964b3
+Subproject 571412931829200aff06a44b9c5524e122e524e
diff --git a/git/test/db/base.py b/git/test/db/base.py
index 202a4353..80cb9ebb 100644
--- a/git/test/db/base.py
+++ b/git/test/db/base.py
@@ -256,7 +256,7 @@ class RepoBase(TestDBBase):
         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')
diff --git a/git/test/db/lib.py b/git/test/db/lib.py
index df9fec76..d406382a 100644
--- a/git/test/db/lib.py
+++ b/git/test/db/lib.py
@@ -64,7 +64,7 @@ class TestDBBase(TestBase):
     #} END configuration
     
     @classmethod
-    def setUpAll(cls):
+    def setUp(cls):
         """
         Dynamically add a read-only repository to our actual type. This way 
         each test type has its own repository
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
index 3d7da451..bb17745c 100644
--- a/git/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -292,7 +292,7 @@ class TestBase(TestCase):
     """
     
     @classmethod
-    def setUpAll(cls):
+    def setUp(cls):
         """This method is only called to provide the most basic functionality
         Subclasses may just override it or implement it differently"""
         cls.rorepo = Repo(rorepo_dir())
diff --git a/git/test/performance/db/looseodb_impl.py b/git/test/performance/db/looseodb_impl.py
index 0c451906..1da69945 100644
--- a/git/test/performance/db/looseodb_impl.py
+++ b/git/test/performance/db/looseodb_impl.py
@@ -60,8 +60,8 @@ class TestLooseDBWPerformanceBase(TestBigRepoR):
     #} END configuration
     
     @classmethod
-    def setUpAll(cls):
-        super(TestLooseDBWPerformanceBase, cls).setUpAll()
+    def setUp(cls):
+        super(TestLooseDBWPerformanceBase, cls).setUp()
         if cls.LooseODBCls is None:
             raise AssertionError("LooseODBCls must be set in subtype")
         #END assert configuration
diff --git a/git/test/performance/db/packedodb_impl.py b/git/test/performance/db/packedodb_impl.py
index 1ca7c8a0..23d00444 100644
--- a/git/test/performance/db/packedodb_impl.py
+++ b/git/test/performance/db/packedodb_impl.py
@@ -27,8 +27,8 @@ class TestPurePackedODBPerformanceBase(TestBigRepoR):
     #} END configuration
     
     @classmethod
-    def setUpAll(cls):
-        super(TestPurePackedODBPerformanceBase, cls).setUpAll()
+    def setUp(cls):
+        super(TestPurePackedODBPerformanceBase, cls).setUp()
         if cls.PackedODBCls is None:
             raise AssertionError("PackedODBCls must be set in subclass")
         #END assert configuration
diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py
index c82ccb16..2772fd7d 100644
--- a/git/test/performance/lib.py
+++ b/git/test/performance/lib.py
@@ -47,8 +47,8 @@ class TestBigRepoR(TestBase):
     #} END configuration
     
     @classmethod
-    def setUpAll(cls):
-        super(TestBigRepoR, cls).setUpAll()
+    def setUp(cls):
+        super(TestBigRepoR, cls).setUp()
         if cls.RepoCls is None:
             raise AssertionError("Require RepoCls in class %s to be set" % cls)
         #END assert configuration
@@ -61,8 +61,8 @@ class TestBigRepoRW(TestBigRepoR):
     Provides ``self.rwrepo``"""
     
     @classmethod
-    def setUpAll(cls):
-        super(TestBigRepoRW, cls).setUpAll()
+    def setUp(cls):
+        super(TestBigRepoRW, cls).setUp()
         dirname = tempfile.mktemp()
         os.mkdir(dirname)
         cls.rwrepo = cls.rorepo.clone(dirname, shared=True, bare=True)
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)