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 2d77d43017e33d33a49e4e25241720c326253d6e..62ae1241ea1ea1f58c26cf58204906acdf4bc7c2 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,15 +8,18 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
-
-git checkout -b nmu
-
-nmu-upload () {
-       t-dch-commit -v $v -m nmu
+nmu-upload-1 () {
+       nmubranch=$1
+       git checkout -f -b $nmubranch
+       t-git-debrebase
+       t-git-debrebase convert-to-gbp
+       # now we are on a gbp patched-unapplied branch
+}
 
-       t-some-changes nmu
 
+nmu-upload-2 () {
+       t-dch-commit -v $v -m "nmu $nmubranch $v"
+       t-some-changes "nmu $numbranch $v"
        t-dch-commit -r sid
 
        t-dgit -wgf build-source
@@ -27,26 +30,40 @@ nmu-upload () {
        dput -c $tmp/dput.cf test-dummy $c
 
        t-archive-process-incoming sid
+       cd $p
+       git checkout master
 }
 
-v=2.0-2+num1
-nmu-upload
+: '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/$nmubranch
+
+       git branch unlaundered.$nmubranch
 
-git diff --exit-code nmu
+       t-git-debrebase
 
-git branch t.before
+       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