zuul
/
zuul
Code Issues Proposed changes

Merge "Clarify missing merge requirement message"

This commit is contained in:
Zuul 2022-06-30 19:46:43 +00:00 committed by Gerrit Code Review
parent 9438b47e1e b784d53f88
commit a7bb00602d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/test_github_driver.py
View File

@ -1202,7 +1202,7 @@ class TestGithubDriver(ZuulTestCase):
self.assertEqual(1, len(A.comments))
self.assertFalse(A.is_merged)
self.assertIn('This change is unable to merge '
'due to a missing requirement.',
'due to a missing merge requirement.',
A.comments[0])
# This test case verifies that no reconfiguration happens if a branch was

2
tests/unit/test_scheduler.py
View File

@ -1921,7 +1921,7 @@ class TestScheduler(ZuulTestCase):
self.assertEqual(2, len(A.messages))
self.assertEqual(A.data['status'], 'NEW')
self.assertIn('This change is unable to merge '
'due to a missing requirement.',
'due to a missing merge requirement.',
A.messages[1])
@simple_layout('layouts/nonvoting-job-approval.yaml')

2
zuul/manager/__init__.py
View File

@ -2012,7 +2012,7 @@ class PipelineManager(metaclass=ABCMeta):
actions = self.pipeline.failure_actions
item.setReportedResult('FAILURE')
elif item.wasDequeuedMissingRequirements():
log.debug("Dequeued missing requirements")
log.debug("Dequeued missing merge requirements")
action = 'failure'
actions = self.pipeline.failure_actions
item.setReportedResult('FAILURE')

2
zuul/reporter/__init__.py
View File

@ -193,7 +193,7 @@ class BaseReporter(object, metaclass=abc.ABCMeta):
msg = 'This change depends on a change that failed to merge.\n'
elif item.dequeued_missing_requirements:
msg = ('This change is unable to merge '
'due to a missing requirement.\n')
'due to a missing merge requirement.\n')
elif item.isBundleFailing():
msg = 'This change is part of a bundle that failed.\n'
if with_jobs: