yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MaintenanceChecker: include project in owner query to utilize local devel.

Browse Source 
For Leap the devel project may override the Factory one.
This commit is contained in:
Jimmy Berry 2017-04-26 15:50:53 -05:00
parent a1cb4aa772
commit 4813734ab0
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
check_maintenance_incidents.py
View File

@ -47,10 +47,19 @@ class MaintenanceChecker(ReviewBot.ReviewBot):
ReviewBot.ReviewBot.__init__(self, *args, **kwargs)
self.review_messages = {}
# XXX: share with checkrepo
def _maintainers(self, package):
"""Get the maintainer of the package involved in the package."""
@memoize(session=True)
def owner_fallback(self, project, package):
root = osc.core.owner(self.apiurl, package, project=project)
owner = root.find('owner')
if not owner or owner.get('project') == project:
# Fallback to global (ex Factory) maintainer.
root = osc.core.owner(self.apiurl, package)
return root
# XXX: share with checkrepo
def _maintainers(self, project, package):
"""Get the maintainer of the package involved in the package."""
root = self.owner_fallback(project, package)
maintainers = [p.get('name') for p in root.findall('.//person') if p.get('role') == 'maintainer']
if not maintainers:
for group in [p.get('name') for p in root.findall('.//group') if p.get('role') == 'maintainer']:
@ -61,7 +70,9 @@ class MaintenanceChecker(ReviewBot.ReviewBot):
def add_devel_project_review(self, req, package):
""" add devel project/package as reviewer """
root = osc.core.owner(self.apiurl, package)
a = req.actions[0]
project = a.tgt_releaseproject if a.type == 'maintenance_incident' else req.actions[0].tgt_project
root = self.owner_fallback(project, package)
package_reviews = set((r.by_project, r.by_package) for r in req.reviews if r.by_project)
for p in root.findall('./owner'):
@ -122,7 +133,7 @@ class MaintenanceChecker(ReviewBot.ReviewBot):
self.logger.info("{} submitted from {}, no maintainer review needed".format(pkgname, a.src_project))
return
maintainers = set(self._maintainers(pkgname))
maintainers = set(self._maintainers(project, pkgname))
if maintainers:
known_maintainer = False
for m in maintainers:

27
tests/maintenance_tests.py
View File

@ -147,7 +147,14 @@ class TestMaintenance(unittest.TestCase):
body = lambda method, uri, headers: change_request(result, method, uri, headers))
httpretty.register_uri(httpretty.GET,
rr("/search/owner?binary=mysql-workbench"),
APIURL + "/search/owner?project=openSUSE:13.2:Update&binary=mysql-workbench",
match_querystring = True,
body = """
<collection/>
""")
httpretty.register_uri(httpretty.GET,
APIURL + "/search/owner?binary=mysql-workbench",
match_querystring = True,
body = """
<collection>
@ -259,7 +266,14 @@ class TestMaintenance(unittest.TestCase):
body = lambda method, uri, headers: change_request(result, method, uri, headers))
httpretty.register_uri(httpretty.GET,
rr("/search/owner?binary=mysql-workbench"),
APIURL + "/search/owner?project=openSUSE:13.2:Update&binary=mysql-workbench",
match_querystring = True,
body = """
<collection/>
""")
httpretty.register_uri(httpretty.GET,
APIURL + "/search/owner?binary=mysql-workbench",
match_querystring = True,
body = """
<collection>
@ -335,7 +349,14 @@ class TestMaintenance(unittest.TestCase):
""")
httpretty.register_uri(httpretty.GET,
rr("/search/owner?binary=plan"),
APIURL + "/search/owner?project=openSUSE:Backports:SLE-12&binary=plan",
match_querystring = True,
body = """
<collection/>
""")
httpretty.register_uri(httpretty.GET,
APIURL + "/search/owner?binary=plan",
match_querystring = True,
body = """
<collection/>