X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=19918d8bc5e546fea77e7a9803231da20c2ae731;hp=c1e9ba9bd814dd01d60f4de8169d8a23db67ebf7;hb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd;hpb=e26989680f3c7f3f219e799c3a64f1e4ee3808ee

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index c1e9ba9b..19918d8b 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -2,48 +2,20 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 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
+t-some-changes $numbranch
+t-nmu-upload-3
 
 : 'done the nmu, switching back to the maintainer hat'
 
@@ -58,7 +30,6 @@ nmu-fold () {
 	git branch unlaundered.$nmubranch
 
 	t-git-debrebase
-
 	t-gdr-good laundered
 
 	t-git-debrebase stitch
@@ -72,4 +43,26 @@ t-dch-commit -v $v -m "incorporate nmu"
 t-dch-commit -r sid
 t-dgit -wgf push-source
 
+: 'now test a new upstream'
+
+t-make-new-upstream-tarball 2.1
+
+git checkout master
+v=2.1-0+nmu1
+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"
+gbp pq import
+
+#t-dgit -wgf build-source
+
+t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
+
+: 'done the nmu, back to the maintainer'
+
+nmu-fold
+
 t-ok