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

Merge pull request #679 from jberry-suse/tags-delete-warn

Browse Source 
check_tags: warn when issue references are removed (plus other fixes)
This commit is contained in:
Ludwig Nussel 2017-02-17 14:04:42 +01:00 committed by GitHub
commit b955c1174c
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
check_tags_in_requests.py
View File

@ -56,7 +56,7 @@ class TagChecker(ReviewBot.ReviewBot):
super(TagChecker, self).__init__(*args, **kwargs) super(TagChecker, self).__init__(*args, **kwargs)
self.factory = "openSUSE:Factory" self.factory = "openSUSE:Factory"
self.review_messages['declined'] = """ self.review_messages['declined'] = """
(This is a script running, so report bugs) (This is a script, so report bugs)
The project you submitted to requires a bug tracker ID marked in the The project you submitted to requires a bug tracker ID marked in the
.changes file. OBS supports several patterns, see .changes file. OBS supports several patterns, see
@ -64,8 +64,8 @@ $ osc api /issue_trackers
See also https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations See also https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations
Note that not necessarily all of the tags listed there are supported Note that not all of the tags listed there are necessarily supported
by OBS on which this bot relies on. by OBS on which this bot relies.
""" """
def isNewPackage(self, tgt_project, tgt_package): def isNewPackage(self, tgt_project, tgt_package):
@ -77,32 +77,33 @@ by OBS on which this bot relies on.
return False return False
def checkTagInRequest(self, req, a): def checkTagInRequest(self, req, a):
is_new = False
u = osc.core.makeurl(self.apiurl, u = osc.core.makeurl(self.apiurl,
['source', a.tgt_project, a.tgt_package], ['source', a.src_project, a.src_package],
{'cmd': 'diff', {'cmd': 'diff',
'onlyissues': '1', 'onlyissues': '1',
'view': 'xml', 'view': 'xml',
'opackage': a.src_package, 'opackage': a.tgt_package,
'oproject': a.src_project, 'oproject': a.tgt_project,
'orev': a.src_rev}) 'rev': a.src_rev})
try: try:
f = osc.core.http_POST(u) f = osc.core.http_POST(u)
except (HTTPError, URLError): except (HTTPError, URLError):
is_new = self.isNewPackage(a.tgt_project, a.tgt_package) if self.isNewPackage(a.tgt_project, a.tgt_package):
self.review_messages['accepted'] = 'New package'
# in case the quest have not the matched revision in Factory
# and it is a new package to target project, then leave it to
# human review
if is_new:
self.logger.info("New package to %s and have not the matched revision in Factory"%a.tgt_project)
return True return True
self.logger.debug('error loading diff, assume transient error')
return None
xml = ET.parse(f) xml = ET.parse(f)
has_changes = list(xml.findall('./issues/issue')) issues = len(xml.findall('./issues/issue'))
if not has_changes: removed = len(xml.findall('./issues/issue[@state="removed"]'))
if issues == 0:
self.logger.debug("reject: diff contains no tags") self.logger.debug("reject: diff contains no tags")
return False return False
if removed > 0:
self.review_messages['accepted'] = 'Warning: {} issues reference(s) removed'.format(removed)
return True
return True return True
def checkTagNotRequired(self, req, a): def checkTagNotRequired(self, req, a):
@ -114,7 +115,7 @@ by OBS on which this bot relies on.
# 1) A tag is not required only if the package is # 1) A tag is not required only if the package is
# already in Factory with the same revision, # already in Factory with the same revision,
# and the package is being introduced, not updated # and the package is being introduced, not updated
# 2) A new package must be have a issue tag # 2) A new package must have an issue tag
factory_checker = check_source_in_factory.FactorySourceChecker(apiurl=self.apiurl, factory_checker = check_source_in_factory.FactorySourceChecker(apiurl=self.apiurl,
dryrun=self.dryrun, dryrun=self.dryrun,
logger=self.logger, logger=self.logger,

6
tests/checktags_tests.py
View File

@ -163,12 +163,12 @@ Pico text editor while also offering a few enhancements.</description>
def _run_with_data(self, accept, exists_in_factory, issues_data): def _run_with_data(self, accept, exists_in_factory, issues_data):
# exists_in_factory: whether the package is exists in factory # exists_in_factory: whether the package is exists in factory
httpretty.register_uri(httpretty.POST, httpretty.register_uri(httpretty.POST,
osc.core.makeurl(APIURL, ['source', "openSUSE:Factory", "nano"], {'cmd': 'diff', osc.core.makeurl(APIURL, ['source', "editors", "nano"], { 'cmd': 'diff',
'onlyissues': '1', 'onlyissues': '1',
'view': 'xml', 'view': 'xml',
'opackage': 'nano', 'opackage': 'nano',
'oproject': 'editors', 'oproject': 'openSUSE:Factory',
'orev': '25'}), 'rev': '25'}),
match_querystring=True, match_querystring=True,
body=issues_data) body=issues_data)
httpretty.register_uri(httpretty.GET, httpretty.register_uri(httpretty.GET,