test suite: manpages-format: work properly when no expected warnings

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

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51f4469100034c22456c1b76086d5ada35..4b5907a1caafc13b49a0e676ce0037da651e5bb2 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 
@@ -10,9 +10,18 @@ cd $p
 
 t-dgit setup-mergechangelogs
 
+: 'maintainer'
+
+git checkout master
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+
 : 'nmu'
 
-git checkout -b nmu
+git checkout -b nmu origin/master~0
 
 t-git-next-date
 
@@ -25,20 +34,11 @@ t-dgit -wgf push-source
 
 t-archive-process-incoming sid
 
-: 'maintainer'
-
-git checkout master
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: 'rebase nmu onto our branch'
 
-t-dgit fetch
 t-git-next-date
-
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
-
-: 'rebase nmu onto our branch'
+git checkout master
+t-nmu-causes-ff-fail
 
 git checkout dgit/dgit/sid # detach