PR#63: Make pagure-dist-git's tests work with the newer pagure - pagure-dist-git

Pierre-Yves Chibon • 7 years ago

c528dfe

Pierre-Yves Chibon • 7 years ago

e1e643b

dist_git_auth.py

file modified

+6 -1

		`@@ -29,7 +29,12 @@`
		`os.environ["PAGURE_CONFIG"] = "/etc/pagure/pagure.cfg"`

		`from pagure.config import config as pagure_config`
		`- from pagure.lib import model, get_user`
		`+ from pagure.lib import model`
		`+ try:`
		`+ from pagure.lib import get_user`
		`+ except ImportError:`
		`+ # From pagure 5.2, code has been moved to pagure.lib.query`
		`+ from pagure.lib.query import get_user`
		`from pagure.lib.git import is_forced_push`
		`from pagure.lib.git_auth import GitAuthHelper, _read_file`
		`from pagure.utils import is_repo_committer`

dist_git_auth_tests.py

file modified

+30 -3

		`@@ -8,8 +8,15 @@`
		`# These are the tests from the pagure/ git repo.`
		`# Run with:`
		`# PYTHONPATH=.:/path/to/pagure/checkout nosetests dist_git_auth_tests.py`
		`- import pagure`
		`- import pagure.lib`
		`+ import pagure.config`
		`+ import pagure.exceptions`
		`+ import pagure.lib.model`
		`+ try:`
		`+ from pagure.lib import _get_project as get_project`
		`+ except ImportError:`
		`+ # From pagure 5.2, code has been moved to pagure.lib.query`
		`+ from pagure.lib.query import _get_project as get_project`
		`+`
		`import tests`

		`import dist_git_auth`
		`@@ -124,7 +131,7 @@`
		`'Invalid', 'Insufficient data', 'Fixed', 'Duplicate']`
		`self.session.add(item)`
		`self.session.commit()`
		`- return pagure.lib._get_project(`
		`+ return get_project(`
		`self.session, name=name, namespace=namespace)`

		`def expect_info_msg(self, expect_msg):`
		`@@ -642,6 +649,26 @@`

		`self.expect_info_msg("SIG push")`

		`+ def test_protected_sig_sig_member_precise(self):`
		`+ project = self.create_namespaced_project('rpms', 'test')`
		`+`
		`+ self.assertTrue(`
		`+ self.dga.check_acl(`
		`+ self.session,`
		`+ project=project,`
		`+ username="arrfab",`
		`+ refname="refs/heads/c7-sig-core",`
		`+ pull_request=None,`
		`+ repodir=None,`
		`+ repotype='main',`
		`+ revfrom=None,`
		`+ revto=None,`
		`+ is_internal=False,`
		`+ )`
		`+ )`
		`+`
		`+ self.expect_info_msg("SIG push")`
		`+`
		`def test_protected_sig_no_sig_member(self):`
		`project = self.create_namespaced_project('rpms', 'test')`