git-debrebase: test suite: lib-gdr: break out some more t-*

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

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 2020d8fd184eac284cdf4bb6fdf65262133558c2..e647f80a0ac8bec16d36df2f6a20a9f56456fe1a 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -12,22 +12,21 @@ t-dgit setup-mergechangelogs
 
 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
+t-git-next-date
+
 v=2.0-2+nmu1
 t-nmu-upload-1 nmu
 gbp pq import
 t-nmu-upload-2
-echo >>newsrc.c "// more upstream"
-git add newsrc.c
-git commit -m 'UPSTREAM NMU'
+t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 
 : 'done the nmu, switching back to the maintainer hat'
 
-t-dch-commit -v2.0-3 -m 'start -3'
+t-git-next-date
 
-t-some-changes 'maintainer'
-t-git-debrebase
-t-git-debrebase stitch
+v=2.0-3
+t-maintainer-commit-some-changes
 
 t-dgit fetch
 t-git-next-date
@@ -45,4 +44,19 @@ git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
 git rm -rf debian/patches
 git commit -m 'Incorporate NMU'
 
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
+
+: 'right, how are we'
+
+t-git-next-date
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+
+t-nmu-reconciled-good patch-queue/nmu
+
 t-ok