git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold

[dgit.git] / tests / tests / gdr-import-dgit

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 8ab8beff4cdfdf06a1063da79095006341ce65d5..62ae1241ea1ea1f58c26cf58204906acdf4bc7c2 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -18,8 +18,6 @@ nmu-upload-1 () {
 
 
 nmu-upload-2 () {
-       gbp pq import
-
        t-dch-commit -v $v -m "nmu $nmubranch $v"
        t-some-changes "nmu $numbranch $v"
        t-dch-commit -r sid
@@ -32,29 +30,40 @@ nmu-upload-2 () {
        dput -c $tmp/dput.cf test-dummy $c
 
        t-archive-process-incoming sid
+       cd $p
+       git checkout master
 }
 
 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
 v=2.0-2+nmu1
 nmu-upload-1 nmu
+gbp pq import
 nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
-cd $p
-git checkout master
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+nmu-fold () {
+       t-dgit fetch
+       git merge --ff-only dgit/dgit/sid
 
-git diff --exit-code patch-queue/nmu
+       git diff --exit-code patch-queue/$nmubranch
 
-git branch t.before
+       git branch unlaundered.$nmubranch
+
+       t-git-debrebase
+
+       t-gdr-good laundered
+
+       t-git-debrebase stitch
+       t-gdr-good stitched
+}
 
-t-git-debrebase
-t-gdr-good laundered
+nmu-fold
 
-t-git-debrebase stitch
-t-gdr-good stitched
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
 
 t-ok