From 97a6d19fa28405a406a6cde8d8e972eee1528bc2 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 11 2015 08:41:23 +0000
Subject: Unit-tests also need to be adjusted for pygit2 0.22


---

diff --git a/tests/__init__.py b/tests/__init__.py
index 44b2720..f6a2087 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -365,7 +365,10 @@ def add_content_git_repo(folder):
     master_ref = repo.lookup_reference('HEAD').resolve()
     refname = '%s:%s' % (master_ref.name, master_ref.name)
 
-    ori_remote.push(refname)
+    if pygit2.__version__.startswith('0.22'):
+        ori_remote.push([refname])
+    else:
+        ori_remote.push(refname)
 
     shutil.rmtree(newfolder)
 
@@ -434,7 +437,10 @@ Dev instance: http://209.132.184.222/ (/!\\ May change unexpectedly, it's a dev 
     master_ref = repo.lookup_reference('HEAD').resolve()
     refname = '%s:%s' % (master_ref.name, master_ref.name)
 
-    ori_remote.push(refname)
+    if pygit2.__version__.startswith('0.22'):
+        ori_remote.push([refname])
+    else:
+        ori_remote.push(refname)
 
     shutil.rmtree(newfolder)
 
@@ -486,7 +492,10 @@ def add_commit_git_repo(folder, ncommits=10):
     master_ref = repo.lookup_reference('HEAD').resolve()
     refname = '%s:%s' % (master_ref.name, master_ref.name)
 
-    ori_remote.push(refname)
+    if pygit2.__version__.startswith('0.22'):
+        ori_remote.push([refname])
+    else:
+        ori_remote.push(refname)
 
     shutil.rmtree(newfolder)
 
@@ -553,7 +562,10 @@ C7Pí^DQeee<84>ÃaÜn·î<98><9e><9e>^^¶oß®<95>ݦM^^T©®®¦®®<8e>©©)�
     master_ref = repo.lookup_reference('HEAD').resolve()
     refname = '%s:%s' % (master_ref.name, master_ref.name)
 
-    ori_remote.push(refname)
+    if pygit2.__version__.startswith('0.22'):
+        ori_remote.push([refname])
+    else:
+        ori_remote.push(refname)
 
     shutil.rmtree(newfolder)
 
diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py
index 0d4aaa1..5c6f0d1 100644
--- a/tests/test_pagure_flask_docs.py
+++ b/tests/test_pagure_flask_docs.py
@@ -155,7 +155,11 @@ class PagureFlaskDocstests(tests.Modeltests):
         # Push the changes to the bare repo
         remote = repo.create_remote(
             'origin', os.path.join(tests.HERE, 'docs', 'test.git'))
-        remote.push('refs/heads/master:refs/heads/master')
+
+        if pygit2.__version__.startswith('0.22'):
+            remote.push(['refs/heads/master:refs/heads/master'])
+        else:
+            remote.push('refs/heads/master:refs/heads/master')
 
         # Now check the UI
 
diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index 38f67b0..6a5e41c 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -93,7 +93,10 @@ class PagureFlaskForktests(tests.Modeltests):
         )
         refname = 'refs/heads/master:refs/heads/master'
         ori_remote = clone_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         first_commit = repo.revparse_single('HEAD')
 
@@ -121,7 +124,10 @@ class PagureFlaskForktests(tests.Modeltests):
             )
             refname = 'refs/heads/master:refs/heads/master'
             ori_remote = clone_repo.remotes[0]
-            ori_remote.push(refname)
+            if pygit2.__version__.startswith('0.22'):
+                ori_remote.push([refname])
+            else:
+                ori_remote.push(refname)
 
         if mtype == 'conflicts':
             with open(os.path.join(repopath, 'sources'), 'w') as stream:
@@ -147,7 +153,10 @@ class PagureFlaskForktests(tests.Modeltests):
             )
             refname = 'refs/heads/master:refs/heads/master'
             ori_remote = clone_repo.remotes[0]
-            ori_remote.push(refname)
+            if pygit2.__version__.startswith('0.22'):
+                ori_remote.push([refname])
+            else:
+                ori_remote.push(refname)
 
         # Set the second repo
 
@@ -184,7 +193,10 @@ class PagureFlaskForktests(tests.Modeltests):
             )
             refname = 'refs/heads/%s' % (branch_from)
             ori_remote = repo.remotes[0]
-            ori_remote.push(refname)
+            if pygit2.__version__.startswith('0.22'):
+                ori_remote.push([refname])
+            else:
+                ori_remote.push(refname)
 
         # Create a PR for these changes
         project = pagure.lib.get_project(self.session, 'test')
@@ -554,7 +566,10 @@ class PagureFlaskForktests(tests.Modeltests):
         )
         refname = 'refs/heads/feature:refs/heads/feature'
         ori_remote = new_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         # Create a PR for these changes
         project = pagure.lib.get_project(self.session, 'test')
@@ -856,7 +871,10 @@ index 9f44358..2a552bb 100644
         )
         refname = 'refs/heads/feature:refs/heads/feature'
         ori_remote = new_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         # Create a PR for these "changes" (there are none, both repos are
         # empty)
diff --git a/tests/test_progit_flask_ui_no_master_branch.py b/tests/test_progit_flask_ui_no_master_branch.py
index d5c766b..2b17a66 100644
--- a/tests/test_progit_flask_ui_no_master_branch.py
+++ b/tests/test_progit_flask_ui_no_master_branch.py
@@ -115,7 +115,10 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
 
         refname = 'refs/heads/feature'
         ori_remote = clone_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         shutil.rmtree(newpath)
 
diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py
index 688415b..b7374a3 100644
--- a/tests/test_progit_flask_ui_repo.py
+++ b/tests/test_progit_flask_ui_repo.py
@@ -583,7 +583,10 @@ class PagureFlaskRepotests(tests.Modeltests):
         )
         refname = 'refs/heads/feature'
         ori_remote = new_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         output = self.app.get('/test')
         self.assertEqual(output.status_code, 200)
diff --git a/tests/test_progit_flask_ui_slash_branch_name.py b/tests/test_progit_flask_ui_slash_branch_name.py
index f8f1ca0..6db5ba2 100644
--- a/tests/test_progit_flask_ui_slash_branch_name.py
+++ b/tests/test_progit_flask_ui_slash_branch_name.py
@@ -89,7 +89,10 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         )
         refname = 'refs/heads/master'
         ori_remote = clone_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         master_branch = clone_repo.lookup_branch('master')
         first_commit = master_branch.get_object().hex
@@ -118,7 +121,10 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
 
         refname = 'refs/heads/maxamilion/feature'
         ori_remote = clone_repo.remotes[0]
-        ori_remote.push(refname)
+        if pygit2.__version__.startswith('0.22'):
+            ori_remote.push([refname])
+        else:
+            ori_remote.push(refname)
 
         shutil.rmtree(newpath)