Report per-branch cyclic-dependency conflicts

If a cycle of dependencies is attempted to be enqueued into a pipeline
and at least one of the participating projects has a per-branch change queue
and the changes in the cycle are in different branches, it can be confusing
for users why the changes were not enqueued.  This is even more likely to
happen with implicit cyclic dependencies such as those from Gerrit's
submitted-together feature (but can happen with any driver).

To aid users in this situation, report this situation back to the code
review system.

Change-Id: I26174849deab627b2cf91d75029c5a2674cc37d6

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/unit/test_cross_crd.py b/tests/unit/test_cross_crd.py
index 442277f51..42d86275b 100644
--- a/tests/unit/test_cross_crd.py
+++ b/tests/unit/test_cross_crd.py
@@ -669,7 +669,7 @@ class TestGithubToGerritCRD(ZuulTestCase):
         # should not be processed in dependent pipeline
         self.assertFalse(A.is_merged)
         self.assertEqual(B.data['status'], 'NEW')
-        self.assertEqual(len(A.comments), 0)
+        self.assertEqual(len(A.comments), 1)
         self.assertEqual(B.reported, 0)
         self.assertEqual(len(self.history), 0)
 
@@ -688,7 +688,7 @@ class TestGithubToGerritCRD(ZuulTestCase):
         self.waitUntilSettled()
 
         self.assertTrue(A.is_merged)
-        self.assertEqual(len(A.comments), 2)
+        self.assertEqual(len(A.comments), 3)
         self.assertEqual(B.data['status'], 'MERGED')
         self.assertEqual(B.reported, 0)