git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 17058f96108c93023000ae667250c15170f5c899..831a253071c4a5e0071d4b155d524327b7d3cd94 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -144,3 +144,39 @@ t-make-new-upstream-tarball () {
        ust=example_$uv.orig.tar.gz
        git archive -o ../$ust --prefix=example-2.0/ make-upstream
 }
+
+t-nmu-upload-1 () {
+       # usage:
+       #  v=<full version>
+       #  nmu-upload-1 <nmubranch>
+       #  gbp pq import or perhaps other similar things
+       #  nmu-upload-2
+
+       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
+}
+
+
+t-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
+}

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 17ab2bc6347d7312eb4390c36f1c1156770edebf..544878b5fb7127c0d72de5d5408dd5c3f0cf4245 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,42 +8,12 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
-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
-}
-
 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
 v=2.0-2+nmu1
-nmu-upload-1 nmu
+t-nmu-upload-1 nmu
 gbp pq import
-nmu-upload-2
+t-nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
@@ -77,7 +47,7 @@ t-make-new-upstream-tarball 2.1
 
 git checkout master
 v=2.1-0+nmu1
-nmu-upload-1 nmu2
+t-nmu-upload-1 nmu2
 
 gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../$ust
 t-dch-commit -v $v -m "new upstream $v"
@@ -85,7 +55,7 @@ gbp pq import
 
 #t-dgit -wgf build-source
 
-nmu-upload-2
+t-nmu-upload-2
 
 : 'done the nmu, back to the maintainer'