Fix unittests for Mock 0.5.0

Author: davisp

test/git/test_repo.py

@@ -116,7 +116,7 @@ def test_blob(self, git):
 
     @patch_object(Repo, '__init__')
     @patch_object(Git, '_call_process')
-    def test_init_bare(self, repo, git):
+    def test_init_bare(self, git, repo):
         git.return_value = True
         repo.return_value = None
 
@@ -129,7 +129,7 @@ def test_init_bare(self, repo, git):
 
     @patch_object(Repo, '__init__')
     @patch_object(Git, '_call_process')
-    def test_init_bare_with_options(self, repo, git):
+    def test_init_bare_with_options(self, git, repo):
         git.return_value = True
         repo.return_value = None
 
@@ -142,7 +142,7 @@ def test_init_bare_with_options(self, repo, git):
 
     @patch_object(Repo, '__init__')
     @patch_object(Git, '_call_process')
-    def test_fork_bare(self, repo, git):
+    def test_fork_bare(self, git, repo):
         git.return_value = None
         repo.return_value = None
 
@@ -155,7 +155,7 @@ def test_fork_bare(self, repo, git):
 
     @patch_object(Repo, '__init__')
     @patch_object(Git, '_call_process')
-    def test_fork_bare_with_options(self, repo, git):
+    def test_fork_bare_with_options(self, git, repo):
         git.return_value = None
         repo.return_value = None
 

test/git/test_tree.py

@@ -56,7 +56,7 @@ def test_content_from_string_invalid_type_should_raise(self):
 
     @patch_object(Blob, 'size')
     @patch_object(Git, '_call_process')
-    def test_slash(self, blob, git):
+    def test_slash(self, git, blob):
         git.return_value = fixture('ls_tree_a')
         blob.return_value = 1
 
@@ -70,7 +70,7 @@ def test_slash(self, blob, git):
 
     @patch_object(Blob, 'size')
     @patch_object(Git, '_call_process')
-    def test_slash_with_zero_length_file(self, blob, git):
+    def test_slash_with_zero_length_file(self, git, blob):
         git.return_value = fixture('ls_tree_a')
         blob.return_value = 0
 
@@ -97,7 +97,7 @@ def test_slash_with_commits(self, git):
 
     @patch_object(Blob, 'size')
     @patch_object(Git, '_call_process')
-    def test_dict(self, blob, git):
+    def test_dict(self, git, blob):
         git.return_value = fixture('ls_tree_a')
         blob.return_value = 1
 
@@ -111,7 +111,7 @@ def test_dict(self, blob, git):
 
     @patch_object(Blob, 'size')
     @patch_object(Git, '_call_process')
-    def test_dict_with_zero_length_file(self, blob, git):
+    def test_dict_with_zero_length_file(self, git, blob):
         git.return_value = fixture('ls_tree_a')
         blob.return_value = 0