zuul/zuul
Code Issues Proposed changes

Merge "Update default merge failed error to mention CRD"

Browse Source
This commit is contained in:
Jenkins 2015-07-20 20:41:32 +00:00 committed by Gerrit Code Review
commit c051e5970b
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/zuul.rst
View File

@ -950,9 +950,10 @@ Here is an example of setting the failure message for jobs that check
whether a change merges cleanly::
- name: ^.*-merge$
failure-message: This change was unable to be automatically merged
with the current state of the repository. Please rebase your
change and upload a new patchset.
failure-message: This change or one of its cross-repo dependencies
was unable to be automatically merged with the current state of
its repository. Please rebase the change and upload a new
patchset.
Projects
""""""""

7
tests/test_scheduler.py
View File

@ -3113,9 +3113,10 @@ For CI problems and help debugging, contact ci@example.org"""
self.registerJobs()
self.assertEqual(
"Merge Failed.\n\nThis change was unable to be automatically "
"merged with the current state of the repository. Please rebase "
"your change and upload a new patchset.",
"Merge Failed.\n\nThis change or one of its cross-repo "
"dependencies was unable to be automatically merged with the "
"current state of its repository. Please rebase the change and "
"upload a new patchset.",
self.sched.layout.pipelines['check'].merge_failure_message)
self.assertEqual(
"The merge failed! For more information...",

14
tests/test_zuultrigger.py
View File

@ -107,9 +107,10 @@ class TestZuulTrigger(ZuulTestCase):
self.assertEqual(E.reported, 0)
self.assertEqual(
B.messages[0],
"Merge Failed.\n\nThis change was unable to be automatically "
"merged with the current state of the repository. Please rebase "
"your change and upload a new patchset.")
"Merge Failed.\n\nThis change or one of its cross-repo "
"dependencies was unable to be automatically merged with the "
"current state of its repository. Please rebase the change and "
"upload a new patchset.")
self.assertTrue("project:org/project status:open" in
self.fake_gerrit.queries)
@ -133,8 +134,9 @@ class TestZuulTrigger(ZuulTestCase):
self.assertEqual(E.reported, 1)
self.assertEqual(
E.messages[0],
"Merge Failed.\n\nThis change was unable to be automatically "
"merged with the current state of the repository. Please rebase "
"your change and upload a new patchset.")
"Merge Failed.\n\nThis change or one of its cross-repo "
"dependencies was unable to be automatically merged with the "
"current state of its repository. Please rebase the change and "
"upload a new patchset.")
self.assertEqual(self.fake_gerrit.queries[1],
"project:org/project status:open")

7
zuul/scheduler.py
View File

@ -272,9 +272,10 @@ class Scheduler(threading.Thread):
pipeline.failure_message = conf_pipeline.get('failure-message',
"Build failed.")
pipeline.merge_failure_message = conf_pipeline.get(
'merge-failure-message', "Merge Failed.\n\nThis change was "
"unable to be automatically merged with the current state of "
"the repository. Please rebase your change and upload a new "
'merge-failure-message', "Merge Failed.\n\nThis change or one "
"of its cross-repo dependencies was unable to be "
"automatically merged with the current state of its "
"repository. Please rebase the change and upload a new "
"patchset.")
pipeline.success_message = conf_pipeline.get('success-message',
"Build succeeded.")