git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 0522818bb6f17ea89f43cc0cab96b22d34330e4e..508f99974568443702c7240ef5044ce10ea5f785 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,33 +8,45 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
+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
+}
 
-git checkout -b nmu
 
-v=2.0-2+num1
-t-dch-commit -v $v -m 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-some-changes nmu
+       t-dgit -wgf build-source
 
-t-dch-commit -r sid
+       cd ..
+       c=${p}_${v}_source.changes
+       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+       dput -c $tmp/dput.cf test-dummy $c
 
-t-dgit -wgf build-source
+       t-archive-process-incoming sid
+       cd $p
+       git checkout master
+}
 
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+: 'non-dgit upload (but we prepare it with dgit anyway)'
 
-t-archive-process-incoming sid
+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 pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
 
-git diff --exit-code nmu
+git diff --exit-code patch-queue/nmu
 
 git branch t.before