Merge "Pagure: Fix handling of threshold_reached: None"

This commit is contained in:
Zuul 2019-12-06 22:00:44 +00:00 committed by Gerrit Code Review
commit cb535e4ee5
2 changed files with 7 additions and 2 deletions

View File

@ -542,7 +542,8 @@ class TestPagureDriver(ZuulTestCase):
self.assertEqual(0, len(self.history))
# Set the score threshold as reached
A.threshold_reached = True
# Here we use None that means no specific score is required
A.threshold_reached = None
self.fake_pagure.emitEvent(A.getPullRequestOpenedEvent())
self.waitUntilSettled()
# connection.canMerge is not validated

View File

@ -795,9 +795,13 @@ class PagureConnection(BaseConnection):
if self._hasRequiredStatusChecks(change):
ci_flag = True
# By default project get -1 in "Minimum score to merge pull-request"
# But this makes the API to return None for threshold_reached. We need
# to handle this case as threshold_reached: True because it means
# no minimal score configured.
threshold = pr.get('threshold_reached')
if threshold is None:
self.log.debug("No threshold_reached attribute found")
threshold = True
log.debug(
'PR %s#%s mergeability details mergeable: %s '