git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload (nfc)

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index bf31ed9ad4c668ea08ebc5d4b9a8a3643e3d32ab..2d77d43017e33d33a49e4e25241720c326253d6e 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -4,7 +4,7 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 
@@ -12,27 +12,32 @@ cd $p
 
 git checkout -b nmu
 
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+nmu-upload () {
+       t-dch-commit -v $v -m nmu
+
+       t-some-changes nmu
 
-t-some-changes nmu
+       t-dch-commit -r sid
 
-t-dch-commit -r sid
+       t-dgit -wgf build-source
 
-t-dgit -wgf build-source
+       cd ..
+       c=${p}_${v}_source.changes
+       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+       dput -c $tmp/dput.cf test-dummy $c
 
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+       t-archive-process-incoming sid
+}
 
-t-archive-process-incoming sid
+v=2.0-2+num1
+nmu-upload
 
 : 'done the nmu, switching back to the maintainer hat'
 
 cd $p
 git checkout master
-t-dgit pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
 
 git diff --exit-code nmu
 
@@ -41,4 +46,7 @@ git branch t.before
 t-git-debrebase
 t-gdr-good laundered
 
+t-git-debrebase stitch
+t-gdr-good stitched
+
 t-ok