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 da119bca098ee1048250c7d7e419a21a6ef64eff..ac4a476ea3596ba34cd87f85c24b654a8c6d6889 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -203,6 +203,11 @@ t-maintainer-commit-some-changes () {
        t-git-next-date
 }
 
        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
 
 t-nmu-reconciled-good () {
        local nmutree=$1
 

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index e647f80a0ac8bec16d36df2f6a20a9f56456fe1a..8f0b9cb0135780a9de29d4457f0636c613140a1a 100755 (executable)
--- 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-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'
 
 
 : 'ad hocery'
 

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51f4469100034c22456c1b76086d5ada35..02fb2f704481763303d55ac89c305ac32c8026cf 100755 (executable)
--- 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-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'
 
 
 : 'rebase nmu onto our branch'