From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 23:33:03 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail
X-Git-Tag: archive/debian/5.0~154
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fe0439371d17132ccb6b7a00f1ee57c0576e44fc

git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index da119bca..ac4a476e 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -203,6 +203,11 @@ t-maintainer-commit-some-changes () {
 	t-git-next-date
 }
 
+t-nmu-causes-ff-fail () {
+	t-expect-fail E:'Not.*fast-forward' \
+	git merge --ff-only dgit/dgit/sid
+}
+
 t-nmu-reconciled-good () {
 	local nmutree=$1
 
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index e647f80a..8f0b9cb0 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -31,8 +31,7 @@ t-maintainer-commit-some-changes
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'ad hocery'
 
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51..02fb2f70 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -35,8 +35,7 @@ t-maintainer-commit-some-changes
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'rebase nmu onto our branch'