git-debrebase: test suite: gdr-*: add a bunch of calls to t-git-next-date

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index a9a318779877eac49c1e10a785856309cf70907d..3d8d954ae720460176773d54a4797965f0f66690 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,41 +8,68 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
-
-git checkout -b nmu
-
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+nmu-upload-1 () {
+       t-git-next-date
+       nmubranch=$1
+       git checkout -f -b $nmubranch
+       t-git-debrebase
+       t-git-debrebase convert-to-gbp
+       t-git-next-date
+       # now we are on a gbp patched-unapplied branch
+}
+
+
+nmu-upload-2 () {
+       t-git-next-date
+       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
+
+       cd ..
+       c=${p}_${v}_source.changes
+       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+       dput -c $tmp/dput.cf test-dummy $c
+
+       t-archive-process-incoming sid
+       t-git-next-date
+       cd $p
+       git checkout master
+}
 
-t-some-changes nmu
+: 'non-dgit upload (but we prepare it with dgit anyway)'
 
-t-dch-commit -r sid
+v=2.0-2+nmu1
+nmu-upload-1 nmu
+gbp pq import
+nmu-upload-2
 
-t-dgit -wgf build-source
+: 'done the nmu, switching back to the maintainer hat'
 
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+nmu-fold () {
+       t-git-next-date
+       t-dgit fetch
+       t-git-next-date
+       git merge --ff-only dgit/dgit/sid
 
-t-archive-process-incoming sid
+       git diff --exit-code patch-queue/$nmubranch
 
-: 'done the nmu, switching back to the maintainer hat'
+       git branch unlaundered.$nmubranch
 
-cd $p
-git checkout master
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+       t-git-debrebase
 
-git diff --exit-code nmu
+       t-gdr-good laundered
 
-git branch t.before
+       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