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

[dgit.git] / tests / tests / gdr-diverge-nmu

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 9b37ca62e11622769ab2857de13f6ddadc899702..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-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'ad hocery'
 
@@ -56,24 +55,7 @@ t-gdr-good laundered
 t-git-debrebase stitch
 t-gdr-good stitched
 
-: 'check that what we have is what is expected'
 
-git checkout -b compare.nmu origin/master~0
-git checkout patch-queue/nmu .
-git rm -rf debian/patches
-git commit -m 'rm patches nmu'
-
-git checkout -b compare.maintainer origin/master~0
-git checkout did.maintainer .
-git rm -rf --ignore-unmatch debian/patches
-git commit --allow-empty -m 'rm patches maintainer'
-
-git merge compare.nmu
-git diff --quiet master
-
-: 'check that dgit still likes it'
-
-git checkout master
-t-dgit -wgf quilt-fixup
+t-nmu-reconciled-good patch-queue/nmu
 
 t-ok