diff --git a/tests/__init__.py b/tests/__init__.py index f6a2087..e9872b8 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -35,7 +35,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure import pagure.lib import pagure.lib.model - +from pagure.lib.repo import PagureRepo DB_PATH = 'sqlite:///:memory:' FAITOUT_URL = 'http://209.132.184.152/faitout/' @@ -365,10 +365,7 @@ def add_content_git_repo(folder): master_ref = repo.lookup_reference('HEAD').resolve() refname = '%s:%s' % (master_ref.name, master_ref.name) - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newfolder) @@ -437,10 +434,7 @@ 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) - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newfolder) @@ -492,10 +486,7 @@ def add_commit_git_repo(folder, ncommits=10): master_ref = repo.lookup_reference('HEAD').resolve() refname = '%s:%s' % (master_ref.name, master_ref.name) - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newfolder) @@ -562,10 +553,7 @@ 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) - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newfolder) diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index 5c6f0d1..4ab0378 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -26,6 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.docs_server import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskDocstests(tests.Modeltests): @@ -156,10 +157,7 @@ class PagureFlaskDocstests(tests.Modeltests): remote = repo.create_remote( 'origin', os.path.join(tests.HERE, 'docs', 'test.git')) - if pygit2.__version__.startswith('0.22'): - remote.push(['refs/heads/master:refs/heads/master']) - else: - remote.push('refs/heads/master:refs/heads/master') + PagureRepo.push(remote, 'refs/heads/master:refs/heads/master') # Now check the UI diff --git a/tests/test_progit_flask_api_project.py b/tests/test_progit_flask_api_project.py index 8ad9c94..c4faf89 100644 --- a/tests/test_progit_flask_api_project.py +++ b/tests/test_progit_flask_api_project.py @@ -28,6 +28,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskApiProjecttests(tests.Modeltests): @@ -84,10 +85,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): ) refname = 'refs/heads/master:refs/heads/master' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) # Tag our first commit first_commit = repo.revparse_single('HEAD') diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py index 6a5e41c..24e499f 100644 --- a/tests/test_progit_flask_ui_fork.py +++ b/tests/test_progit_flask_ui_fork.py @@ -26,6 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskForktests(tests.Modeltests): @@ -93,10 +94,7 @@ class PagureFlaskForktests(tests.Modeltests): ) refname = 'refs/heads/master:refs/heads/master' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) first_commit = repo.revparse_single('HEAD') @@ -124,10 +122,7 @@ class PagureFlaskForktests(tests.Modeltests): ) refname = 'refs/heads/master:refs/heads/master' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) if mtype == 'conflicts': with open(os.path.join(repopath, 'sources'), 'w') as stream: @@ -153,10 +148,7 @@ class PagureFlaskForktests(tests.Modeltests): ) refname = 'refs/heads/master:refs/heads/master' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) # Set the second repo @@ -193,10 +185,7 @@ class PagureFlaskForktests(tests.Modeltests): ) refname = 'refs/heads/%s' % (branch_from) ori_remote = repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) # Create a PR for these changes project = pagure.lib.get_project(self.session, 'test') @@ -566,10 +555,7 @@ class PagureFlaskForktests(tests.Modeltests): ) refname = 'refs/heads/feature:refs/heads/feature' ori_remote = new_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) # Create a PR for these changes project = pagure.lib.get_project(self.session, 'test') @@ -871,10 +857,7 @@ index 9f44358..2a552bb 100644 ) refname = 'refs/heads/feature:refs/heads/feature' ori_remote = new_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, 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 2b17a66..2addff7 100644 --- a/tests/test_progit_flask_ui_no_master_branch.py +++ b/tests/test_progit_flask_ui_no_master_branch.py @@ -26,6 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskNoMasterBranchtests(tests.Modeltests): @@ -115,10 +116,7 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests): refname = 'refs/heads/feature' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newpath) diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py index b7374a3..0c53945 100644 --- a/tests/test_progit_flask_ui_repo.py +++ b/tests/test_progit_flask_ui_repo.py @@ -26,6 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskRepotests(tests.Modeltests): @@ -583,10 +584,7 @@ class PagureFlaskRepotests(tests.Modeltests): ) refname = 'refs/heads/feature' ori_remote = new_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, 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 6db5ba2..02691e1 100644 --- a/tests/test_progit_flask_ui_slash_branch_name.py +++ b/tests/test_progit_flask_ui_slash_branch_name.py @@ -26,6 +26,7 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests +from pagure.lib.repo import PagureRepo class PagureFlaskSlashInBranchtests(tests.Modeltests): @@ -89,10 +90,7 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests): ) refname = 'refs/heads/master' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) master_branch = clone_repo.lookup_branch('master') first_commit = master_branch.get_object().hex @@ -121,10 +119,7 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests): refname = 'refs/heads/maxamilion/feature' ori_remote = clone_repo.remotes[0] - if pygit2.__version__.startswith('0.22'): - ori_remote.push([refname]) - else: - ori_remote.push(refname) + PagureRepo.push(ori_remote, refname) shutil.rmtree(newpath)