PR#92: Make the code flake8/black compliant and enforce it - pagure-dist-git

pagure-dist-git

#92 Make the code flake8/black compliant and enforce it

Merged 4 years ago by pingou. Opened 4 years ago by pingou.

code_style into master

Add a test for the coding style we want to follow on pagure-dist-git

Pierre-Yves Chibon • 4 years ago

e97fdd5

Adjust the requirements for testing

Pierre-Yves Chibon • 4 years ago

60f7538

Make the pagure_distgit code black and flake8 compliant

Pierre-Yves Chibon • 4 years ago

e001ff8

pagure_distgit/forms.py

file modified

+6 -8

		`@@ -9,12 +9,12 @@`

		`"""`

		`- from __future__ import unicode_literals, print_function`
		`-`
		`- import wtforms`
		`+ from __future__ import print_function, unicode_literals`

		`import pagure.forms`

		`+ import wtforms`
		`+`

		`class AnityaForm(pagure.forms.PagureForm):`
		`""" Form to configure taiga for a project. """`
		`@@ -29,16 +29,14 @@`
		`],`
		`)`

		`-`
		`+`
		`class BZOverrideForm(pagure.forms.PagureForm):`
		`""" Form to configure the Fedora/EPEL maintainer for a project. """`

		`fedora_assignee = wtforms.StringField(`
		`- "Maintainer name",`
		`- [ wtforms.validators.optional(strip_whitespace=True) ],`
		`+ "Maintainer name", [wtforms.validators.optional(strip_whitespace=True)]`
		`)`
		`epel_assignee = wtforms.StringField(`
		`"EPEL Maintainer name",`
		`- [ wtforms.validators.optional(strip_whitespace=True) ],`
		`+ [wtforms.validators.optional(strip_whitespace=True)],`
		`)`
		`-`

pagure_distgit/model.py

file modified

+6 -12

		`@@ -8,17 +8,15 @@`

		`"""`

		`- from __future__ import unicode_literals, print_function`
		`+ from __future__ import print_function, unicode_literals`

		`import logging`
		`- import sqlalchemy as sa`
		`-`
		`- from sqlalchemy.orm import backref`
		`- from sqlalchemy.orm import relation`

		`- from pagure.lib.model_base import BASE`
		`from pagure.lib.model import Project`
		`+ from pagure.lib.model_base import BASE`

		`+ import sqlalchemy as sa`
		`+ from sqlalchemy.orm import backref, relation`

		`_log = logging.getLogger(__name__)`

		`@@ -76,12 +74,8 @@`
		`index=True,`
		`)`

		`- epel_assignee = sa.Column(`
		`- sa.String(255), unique=False`
		`- )`
		`- fedora_assignee = sa.Column(`
		`- sa.String(255), unique=False`
		`- )`
		`+ epel_assignee = sa.Column(sa.String(255), unique=False)`
		`+ fedora_assignee = sa.Column(sa.String(255), unique=False)`

		`project = relation(`
		`"Project",`

pagure_distgit/plugin.py

file modified

+33 -25

		`@@ -9,22 +9,24 @@`

		`"""`

		`- from __future__ import unicode_literals, print_function`
		`+ from __future__ import print_function, unicode_literals`
		`+`
		`import collections`
		`- import datetime`
		`import logging`

		`import flask`
		`- import requests`
		`- from sqlalchemy.exc import SQLAlchemyError`

		`import pagure.utils`
		`- from pagure.api import api_method, APIERROR, api_login_required`
		`- from pagure.api.utils import _get_repo, _check_token`
		`+ from pagure.api import APIERROR, api_login_required, api_method`
		`+ from pagure.api.utils import _check_token, _get_repo`

		`import pagure_distgit.forms`
		`from pagure_distgit import model`

		`+ import requests`
		`+`
		`+ from sqlalchemy.exc import SQLAlchemyError`
		`+`

		`_log = logging.getLogger(__name__)`

		`@@ -122,8 +124,8 @@`
		`raise pagure.exceptions.APIError(`
		`500,`
		`error_code=APIERROR.ENOCODE,`
		`- error="This pagure instance has no PDC_URL configured, please inform"`
		`- " your pagure administrators",`
		`+ error="This pagure instance has no PDC_URL configured, please "`
		`+ "inform your pagure administrators",`
		`)`
		`else:`
		`pdc_url = "%s/component-branches/" % pdc_url.rstrip("/")`
		`@@ -141,7 +143,7 @@`

		`try:`
		`pdc_namespace = to_pdc_namespace[namespace]`
		`- except:`
		`+ except Exception:`
		`raise pagure.exceptions.APIError(`
		`500,`
		`error_code=APIERROR.ENOCODE,`
		`@@ -167,7 +169,7 @@`

		`try:`
		`data = req.json()`
		`- except:`
		`+ except Exception:`
		`raise pagure.exceptions.APIError(`
		`500,`
		`error_code=APIERROR.ENOCODE,`
		`@@ -177,7 +179,7 @@`
		`_log.info(`
		`"%s/%s is active: %s", namespace, name, data["results"][0]["active"]`
		`)`
		`- return data["results"][0]["active"] == True`
		`+ return data["results"][0]["active"] is True`


		`@DISTGIT_NS.route("/take_orphan/<namespace>/<repo>", methods=["POST"])`
		`@@ -323,11 +325,16 @@`
		`updates[update["release"]["name"]][update["status"]] = name`

		`if html:`
		`- html_output = """<table class="table table-bordered table-striped">`
		`- <tr><th scope="col">Release</th><th scope="col">Stable version</th><th scope="col">Version in testing</th></tr>`
		`- """`
		`+ html_output = (`
		`+ '<table class="table table-bordered table-striped">\n'`
		`+ '<tr><th scope="col">Release</th><th scope="col">Stable version'`
		`+ '</th><th scope="col">Version in testing</th></tr>\n'`
		`+ )`
		`for release in sorted(releases, reverse=True):`
		`- row = "<tr><td scope='row' class='text-align-left'>{release}</td><td>{stable}</td><td>{testing}</td></tr>"`
		`+ row = (`
		`+ "<tr><td scope='row' class='text-align-left'>{release}</td>"`
		`+ "<td>{stable}</td><td>{testing}</td></tr>"`
		`+ )`
		`stable = ""`
		`if updates.get(release, {}).get("stable"):`
		`stable = (`
		`@@ -337,8 +344,9 @@`
		`)`
		`)`
		`else:`
		`- # This makes things a little slower and is only needed up until all releases will have gone`
		`- # through bodhi all the time (ie: up until about F31 is eol).`
		`+ # This makes things a little slower and is only needed up until`
		`+ # all releases will have gone through bodhi all the time`
		`+ # (ie: up until about F31 is eol).`
		`mdapi_url = "https://mdapi.fedoraproject.org/%s/srcpkg/%s" % (`
		`release.lower(),`
		`repo.name,`
		`@@ -384,8 +392,10 @@`
		`Defaults to the repo user if unset.`
		`"""`
		`repo = _get_repo(repo, namespace=namespace)`
		`- output = {"fedora_assignee": repo.user.username,`
		`- "epel_assignee": repo.user.username }`
		`+ output = {`
		`+ "fedora_assignee": repo.user.username,`
		`+ "epel_assignee": repo.user.username,`
		`+ }`
		`if repo.bzoverride:`
		`if repo.bzoverride.fedora_assignee:`
		`output["fedora_assignee"] = repo.bzoverride.fedora_assignee`
		`@@ -406,10 +416,7 @@`
		`is_site_admin = pagure.utils.is_admin()`
		`# Only allow the main admin and Pagure site admins to modify projects'`
		`# monitoring, even if the user has the right ACLs on their token`
		`- if (`
		`- flask.g.fas_user.username != repo.user.username`
		`- and not is_site_admin`
		`- ):`
		`+ if flask.g.fas_user.username != repo.user.username and not is_site_admin:`
		`raise pagure.exceptions.APIError(`
		`401, error_code=APIERROR.EMODIFYPROJECTNOTALLOWED`
		`)`
		`@@ -431,8 +438,9 @@`
		`flask.g.session.add(repo)`
		`else:`
		`mapping = model.PagureBZOverride(`
		`- project_id=repo.id, epel_assignee=epel_assignee,`
		`- fedora_assignee=fedora_assignee`
		`+ project_id=repo.id,`
		`+ epel_assignee=epel_assignee,`
		`+ fedora_assignee=fedora_assignee,`
		`)`
		`flask.g.session.add(mapping)`
		`flask.g.session.commit()`

pagure_distgit_tests/bugzilla_overrides_tests.py

file modified

-1

		`@@ -193,7 +193,6 @@`
		`user = tests.FakeUser(username="pingou")`
		`with tests.user_set(self.app.application, user):`
		`# change one assignee`
		`- expected_result = {"epel_assignee": "foo"}`
		`datainput = {"epel_assignee": "foo"}`
		`output = self.app.post(`
		`"/_dg/bzoverrides/somenamespace/test3", data=datainput`

pagure_distgit_tests/dist_git_auth_tests.py

file modified

+115 -108

		`@@ -1,13 +1,11 @@`
		`from __future__ import print_function`

		`- import tempfile`
		`- import os`
		`-`
		`from mock import Mock, patch`

		`import pagure.config`
		`import pagure.exceptions`
		`import pagure.lib.model`
		`+`
		`try:`
		`from pagure.lib import _get_project as get_project`
		`except ImportError:`
		`@@ -19,7 +17,6 @@`
		`import dist_git_auth`


		`-`
		`def patch_pdc(values):`
		`""" Decorator to patch the PDC calls to return values for this test.`

		`@@ -31,6 +28,7 @@`
		`for rpms and modules.`
		`e.g.: {'rpm/test': {'f28': True, 'f27': False}}`
		`"""`
		`+`
		`def pdc_get_paged(_, global_component, type, name, fields):`
		`""" Function that emulates the pdc.get_paged call`

		`@@ -43,7 +41,7 @@`
		`name (string): The branch name`
		`fields (list): Always ["active"]`
		`"""`
		`- fullname = '%s/%s' % (type, global_component)`
		`+ fullname = "%s/%s" % (type, global_component)`
		`if fullname not in values:`
		`return []`
		`val = values[fullname]`
		`@@ -57,11 +55,16 @@`

		`def decorator(func):`
		`def test_wrapper(args, *kwargs):`
		`- with patch.object(dist_git_auth.PDCClient, '__getitem__'):`
		`- with patch.object(dist_git_auth.PDCClient, 'get_paged',`
		`- side_effect=pdc_get_paged):`
		`+ with patch.object(dist_git_auth.PDCClient, "__getitem__"):`
		`+ with patch.object(`
		`+ dist_git_auth.PDCClient,`
		`+ "get_paged",`
		`+ side_effect=pdc_get_paged,`
		`+ ):`
		`return func(args, *kwargs)`
		`+`
		`return test_wrapper`
		`+`
		`return decorator`


		`@@ -74,8 +77,8 @@`
		`""" Set up the environment in which to run the tests. """`
		`super(DistGitAuthTests, self).setUp()`

		`- pagure.config.config['ACL_DEBUG'] = True`
		`- pagure.config.config['EXTERNAL_COMMITTER'] = {"relenggroup": {}}`
		`+ pagure.config.config["ACL_DEBUG"] = True`
		`+ pagure.config.config["EXTERNAL_COMMITTER"] = {"relenggroup": {}}`
		`pagure.config.config.update(self.dga_config)`

		`self.dga = dist_git_auth.DistGitAuth()`
		`@@ -85,17 +88,17 @@`

		`# Create an RCM user/group`
		`rcmuser = pagure.lib.model.User(`
		`- user='releng',`
		`- fullname='Release Engineering',`
		`- token='aaabbbcd',`
		`- default_email='rcm@local.local',`
		`+ user="releng",`
		`+ fullname="Release Engineering",`
		`+ token="aaabbbcd",`
		`+ default_email="rcm@local.local",`
		`)`
		`self.session.add(rcmuser)`
		`self.session.flush()`
		`rcmgroup = pagure.lib.model.PagureGroup(`
		`- group_name='relenggroup',`
		`- group_type='user',`
		`- display_name='Releng group',`
		`+ group_name="relenggroup",`
		`+ group_type="user",`
		`+ display_name="Releng group",`
		`user_id=rcmuser.id,`
		`)`
		`self.session.add(rcmgroup)`
		`@@ -108,23 +111,28 @@`
		`self.dga = None`
		`super(DistGitAuthTests, self).tearDown()`

		`- def create_namespaced_project(self, namespace, name, is_fork=False, settings={}):`
		`+ def create_namespaced_project(`
		`+ self, namespace, name, is_fork=False, settings={}`
		`+ ):`
		`item = pagure.lib.model.Project(`
		`user_id=1, # pingou`
		`name=name,`
		`is_fork=is_fork,`
		`parent_id=3 if is_fork else None,`
		`- description='namespaced test project',`
		`- hook_token='aaabbbeee',`
		`+ description="namespaced test project",`
		`+ hook_token="aaabbbeee",`
		`namespace=namespace,`
		`- settings=settings`
		`+ settings=settings,`
		`)`
		`item.close_status = [`
		`- 'Invalid', 'Insufficient data', 'Fixed', 'Duplicate']`
		`+ "Invalid",`
		`+ "Insufficient data",`
		`+ "Fixed",`
		`+ "Duplicate",`
		`+ ]`
		`self.session.add(item)`
		`self.session.commit()`
		`- return get_project(`
		`- self.session, name=name, namespace=namespace)`
		`+ return get_project(self.session, name=name, namespace=namespace)`

		`def expect_info_msg(self, expect_msg):`
		`found = False`
		`@@ -135,7 +143,8 @@`
		`found = True`
		`if not found:`
		`raise AssertionError(`
		`- "Info message '%s' expected but not found" % expect_msg)`
		`+ "Info message '%s' expected but not found" % expect_msg`
		`+ )`


		`class DistGitAuthTestsGeneric(DistGitAuthTests):`
		`@@ -150,7 +159,7 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='tickets',`
		`+ repotype="tickets",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -162,7 +171,7 @@`
		`def test_branch_deletion(self):`
		`dist_git_auth.is_forced_push.return_value = True`

		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -172,9 +181,9 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`- revto='0000000000000000000000000000000000000000',`
		`+ revto="0000000000000000000000000000000000000000",`
		`is_internal=False,`
		`)`
		`)`
		`@@ -184,7 +193,7 @@`
		`def test_forced_push(self):`
		`dist_git_auth.is_forced_push.return_value = True`

		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -194,7 +203,7 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -204,7 +213,7 @@`
		`self.expect_info_msg("Forced pushes are not allowed")`

		`def test_internal(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -214,7 +223,7 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=True,`
		`@@ -224,7 +233,7 @@`
		`self.expect_info_msg("Internal push allowed")`

		`def test_deploykey(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -234,7 +243,7 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -244,7 +253,7 @@`
		`self.expect_info_msg("Deploy keys are disabled")`

		`def test_invalid_user(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertRaises(`
		`pagure.exceptions.PagureException,`
		`@@ -255,14 +264,14 @@`
		`refname=None,`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`)`

		`def test_unprotected_committer(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -272,7 +281,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -282,7 +291,7 @@`
		`self.expect_info_msg("Committer push")`

		`def test_unprotected_non_committer(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -292,7 +301,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -302,7 +311,7 @@`
		`self.expect_info_msg("Fall-through deny")`

		`def test_unprotected_pr_required_pr(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`
		`self.dga.global_pr_only = True`

		`self.assertTrue(`
		`@@ -313,7 +322,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=True,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -323,7 +332,7 @@`
		`self.expect_info_msg("Committer push")`

		`def test_unprotected_pr_required_no_pr(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`
		`self.dga.global_pr_only = True`

		`self.assertFalse(`
		`@@ -334,7 +343,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -344,7 +353,7 @@`
		`self.expect_info_msg("A pull request is required for this branch")`

		`def test_unprotected_pr_required_no_pr_cvsadmin(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`
		`self.dga.global_pr_only = True`

		`self.assertTrue(`
		`@@ -355,7 +364,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -365,7 +374,7 @@`
		`self.expect_info_msg("Committer push")`

		`def test_unprotected_pr_required_requests(self):`
		`- project = self.create_namespaced_project('unprotected', 'test')`
		`+ project = self.create_namespaced_project("unprotected", "test")`
		`self.dga.global_pr_only = True`

		`self.assertTrue(`
		`@@ -376,7 +385,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='requests',`
		`+ repotype="requests",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -387,7 +396,9 @@`

		`def test_unprotected_pr_required_repo_pr_only_no_pr(self):`
		`settings = {"pull_request_access_only": True}`
		`- project = self.create_namespaced_project('unprotected', 'test', settings=settings)`
		`+ project = self.create_namespaced_project(`
		`+ "unprotected", "test", settings=settings`
		`+ )`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -397,7 +408,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -409,9 +420,7 @@`
		`def test_unprotected_pr_required_repo_pr_only(self):`
		`settings = {"pull_request_access_only": True}`
		`project = self.create_namespaced_project(`
		`- 'unprotected',`
		`- 'test',`
		`- settings=settings`
		`+ "unprotected", "test", settings=settings`
		`)`
		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -421,7 +430,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request="pull_request",`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -433,20 +442,18 @@`

		`class DistGitAuthTestsFedora(DistGitAuthTests):`
		`dga_config = {`
		`- 'PR_ONLY': False,`
		`- 'ACL_BLOCK_UNSPECIFIED': False,`
		`- 'BLACKLIST_RES': ['refs/heads/c[0-9]+.*'],`
		`- 'UNSPECIFIED_BLACKLIST_RES': [`
		`- 'refs/heads/f[0-9]+',`
		`- ],`
		`- 'RCM_GROUP': 'relenggroup',`
		`- 'RCM_BRANCHES': ['refs/heads/f[0-9]+'],`
		`- 'ACL_PROTECTED_NAMESPACES': ['rpms', 'modules', 'container'],`
		`- 'PDC_URL': 'invalid://',`
		`+ "PR_ONLY": False,`
		`+ "ACL_BLOCK_UNSPECIFIED": False,`
		`+ "BLACKLIST_RES": ["refs/heads/c[0-9]+.*"],`
		`+ "UNSPECIFIED_BLACKLIST_RES": ["refs/heads/f[0-9]+"],`
		`+ "RCM_GROUP": "relenggroup",`
		`+ "RCM_BRANCHES": ["refs/heads/f[0-9]+"],`
		`+ "ACL_PROTECTED_NAMESPACES": ["rpms", "modules", "container"],`
		`+ "PDC_URL": "invalid://",`
		`}`

		`def test_protected_blacklisted_ref(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -456,7 +463,7 @@`
		`refname="refs/heads/c7",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -466,7 +473,7 @@`
		`self.expect_info_msg("Ref refs/heads/c7 is blocked")`

		`def test_protected_rcm(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -476,7 +483,7 @@`
		`refname="refs/heads/f27",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -487,7 +494,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_unsupported_branch(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -497,7 +504,7 @@`
		`refname="refs/heads/f26",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -508,7 +515,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_supported_branch_committer(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -518,7 +525,7 @@`
		`refname="refs/heads/f27",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -529,7 +536,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_supported_branch_non_committer(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -539,7 +546,7 @@`
		`refname="refs/heads/f27",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -550,7 +557,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_unspecified_branch_blacklisted(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -560,7 +567,7 @@`
		`refname="refs/heads/f28",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -571,7 +578,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_unspecified_branch_normal_committer(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -581,7 +588,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -592,7 +599,7 @@`

		`@patch_pdc({"rpm/test": {"f26": False, "f27": True}})`
		`def test_protected_unspecified_branch_normal_non_committer(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -602,7 +609,7 @@`
		`refname="refs/heads/mywip",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -614,14 +621,14 @@`

		`class DistGitAuthTestsCentOS(DistGitAuthTests):`
		`dga_config = {`
		`- 'PR_ONLY': False,`
		`- 'ACL_BLOCK_UNSPECIFIED': True,`
		`- 'BLACKLIST_RES': ['refs/heads/f[0-9]+.*'],`
		`- 'RCM_GROUP': 'relenggroup',`
		`- 'RCM_BRANCHES': ['refs/heads/c[0-9]+'],`
		`- 'SUPPORTED_SIGS': ['sig-core'],`
		`- 'SIG_PREFIXES': ['refs/heads/c7'],`
		`- 'ACL_PROTECTED_NAMESPACES': ['rpms'],`
		`+ "PR_ONLY": False,`
		`+ "ACL_BLOCK_UNSPECIFIED": True,`
		`+ "BLACKLIST_RES": ["refs/heads/f[0-9]+.*"],`
		`+ "RCM_GROUP": "relenggroup",`
		`+ "RCM_BRANCHES": ["refs/heads/c[0-9]+"],`
		`+ "SUPPORTED_SIGS": ["sig-core"],`
		`+ "SIG_PREFIXES": ["refs/heads/c7"],`
		`+ "ACL_PROTECTED_NAMESPACES": ["rpms"],`
		`}`

		`def setUp(self):`
		`@@ -629,17 +636,17 @@`

		`# Create an RCM user/group`
		`arrfab = pagure.lib.model.User(`
		`- user='arrfab',`
		`- fullname='Fabian Arriton',`
		`- token='aaabbbcd',`
		`- default_email='arrfab@local.local',`
		`+ user="arrfab",`
		`+ fullname="Fabian Arriton",`
		`+ token="aaabbbcd",`
		`+ default_email="arrfab@local.local",`
		`)`
		`self.session.add(arrfab)`
		`self.session.flush()`
		`sigcore = pagure.lib.model.PagureGroup(`
		`- group_name='sig-core',`
		`- group_type='user',`
		`- display_name='Core SIG group',`
		`+ group_name="sig-core",`
		`+ group_type="user",`
		`+ display_name="Core SIG group",`
		`user_id=arrfab.id,`
		`)`
		`self.session.add(sigcore)`
		`@@ -648,7 +655,7 @@`
		`self.session.commit()`

		`def test_protected_blacklisted_ref(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -658,7 +665,7 @@`
		`refname="refs/heads/f27",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -668,7 +675,7 @@`
		`self.expect_info_msg("Ref refs/heads/f27 is blocked")`

		`def test_protected_rcm(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -678,7 +685,7 @@`
		`refname="refs/heads/c7",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -688,7 +695,7 @@`
		`self.expect_info_msg("RCM push")`

		`def test_protected_sig_sig_member(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -698,7 +705,7 @@`
		`refname="refs/heads/c7-sig-core-test",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -708,7 +715,7 @@`
		`self.expect_info_msg("SIG push")`

		`def test_protected_sig_sig_member_precise(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertTrue(`
		`self.dga.check_acl(`
		`@@ -718,7 +725,7 @@`
		`refname="refs/heads/c7-sig-core",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -728,7 +735,7 @@`
		`self.expect_info_msg("SIG push")`

		`def test_protected_sig_no_sig_member(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -738,7 +745,7 @@`
		`refname="refs/heads/c7-sig-core-test",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`
		`@@ -748,7 +755,7 @@`
		`self.expect_info_msg("Access to namespace rpms is restricted")`

		`def test_protected_sig_sig_member_no_sig_branch(self):`
		`- project = self.create_namespaced_project('rpms', 'test')`
		`+ project = self.create_namespaced_project("rpms", "test")`

		`self.assertFalse(`
		`self.dga.check_acl(`
		`@@ -758,7 +765,7 @@`
		`refname="refs/heads/c7",`
		`pull_request=None,`
		`repodir=None,`
		`- repotype='main',`
		`+ repotype="main",`
		`revfrom=None,`
		`revto=None,`
		`is_internal=False,`

pagure_distgit_tests/tests_style.py

file added

+109

		`@@ -0,0 +1,109 @@`
		`+ #!/usr/bin/env python`
		`+ # -- coding: utf-8 --`
		`+`
		`+ """`
		`+ (c) 2019 - Copyright Red Hat Inc`
		`+`
		`+ Authors:`
		`+ Pierre-Yves Chibon <pingou@pingoured.fr>`
		`+`
		`+ Tests for flake8 and black compliance of the code`
		`+`
		`+ """`
		`+`
		`+ from __future__ import unicode_literals, absolute_import`
		`+`
		`+ import os`
		`+ import subprocess`
		`+ import sys`
		`+ import unittest`
		`+`
		`+ import six`
		`+`
		`+ REPO_PATH = os.path.abspath(`
		`+ os.path.join(os.path.dirname(__file__), "..", "pagure_distgit")`
		`+ )`
		`+ TESTS_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__)))`
		`+`
		`+`
		`+ class TestStyle(unittest.TestCase):`
		`+ """This test class contains tests pertaining to code style."""`
		`+`
		`+ def test_code_with_flake8(self):`
		`+ """Enforce PEP-8 compliance on the codebase.`
		`+`
		`+ This test runs flake8 on the code, and will fail if it returns a`
		`+ non-zero exit code.`
		`+ """`
		`+ # We ignore E712, which disallows non-identity comparisons with True and False`
		`+ # We ignore W503, which disallows line break before binary operator`
		`+ flake8_command = [`
		`+ sys.executable,`
		`+ "-m",`
		`+ "flake8",`
		`+ "--ignore=E712,W503,E203",`
		`+ REPO_PATH,`
		`+ ]`
		`+`
		`+ # check if we have an old flake8 or not`
		`+ import flake8`
		`+`
		`+ flake8_v = flake8.__version__.split(".")`
		`+ for idx, val in enumerate(flake8_v):`
		`+ try:`
		`+ val = int(val)`
		`+ except ValueError:`
		`+ pass`
		`+ flake8_v[idx] = val`
		`+ old_flake = tuple(flake8_v) < (3, 0)`
		`+`
		`+ if old_flake:`
		`+ raise unittest.SkipTest("Flake8 version too old to be useful")`
		`+`
		`+ proc = subprocess.Popen(`
		`+ flake8_command, stdout=subprocess.PIPE, cwd=REPO_PATH`
		`+ )`
		`+ print(proc.communicate())`
		`+`
		`+ self.assertEqual(proc.returncode, 0)`
		`+`
		`+ @unittest.skipIf(`
		`+ not (six.PY3 and sys.version_info.minor >= 6),`
		`+ "Black is only available in python 3.6+",`
		`+ )`
		`+ def test_code_with_black(self):`
		`+ """Enforce black compliance on the codebase.`
		`+`
		`+ This test runs black on the code, and will fail if it returns a`
		`+ non-zero exit code.`
		`+ """`
		`+ black_command = [`
		`+ sys.executable,`
		`+ "-m",`
		`+ "black",`
		`+ "-l",`
		`+ "79",`
		`+ "--check",`
		`+ "--exclude",`
		`+ '"/(\.eggs\|\.git\|\.hg\|\.mypy_cache\|\.nox\|\.tox\|\.venv\|'`
		`+ '_build\|buck-out\|build\|dist)/"', # noqa`
		`+ REPO_PATH,`
		`+ TESTS_PATH,`
		`+ ]`
		`+ proc = subprocess.Popen(`
		`+ black_command,`
		`+ stdout=subprocess.PIPE,`
		`+ stderr=subprocess.PIPE,`
		`+ cwd=REPO_PATH,`
		`+ )`
		`+ stdout, stderr = proc.communicate()`
		`+ print("stdout: ")`
		`+ print(stdout.decode("utf-8"))`
		`+ print("stderr: ")`
		`+ print(stderr.decode("utf-8"))`
		`+`
		`+ self.assertEqual(proc.returncode, 0)`
		`+`
		`+`
		`+ if __name__ == "__main__":`
		`+ unittest.main(verbosity=2)`