test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches

We are about to extend the set of situations where dgit runs
git-debrebase make-patches, with the result that the patch commit in
this conflict will be made by gdr.

This is good, so allow it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index 1d136a94b0bfb85751868d07417a72d7529b4c0b..ad39577a4ab2c7d07323cacb6cadfcfdcf944213 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -42,7 +42,7 @@ t-nmu-causes-ff-fail
 
 git checkout dgit/dgit/sid # detach
 
-t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \
+t-expect-fail 'E:CONFLICT.*Commit (patch queue|Debian 3\.0 \(quilt\) metadata)' \
 git rebase master
 git rebase --skip