Update default merge failed error to mention CRD
The merge failure message is the same whether your change failed to
merge or it was one of its dependencies, including cross-repo
dependencies. Update the default error message for this to mention
the latter possibility so that contributors don't unnecessarily
rebase a dependent change which doesn't actually need it.
Change-Id: Ia17d9ab2a842574cf684b4ebb955dd2ec6e9ec3d
diff --git a/tests/test_zuultrigger.py b/tests/test_zuultrigger.py
index 2f0e4f0..0d52fc9 100644
--- a/tests/test_zuultrigger.py
+++ b/tests/test_zuultrigger.py
@@ -107,9 +107,10 @@
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 @@
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")