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=508f99974568443702c7240ef5044ce10ea5f785;hb=047db2064cbc162d8fceff77ec6dd38eab135c6c;hpb=7a7d4edca749163adbed4c11093aa40d6b94e20b

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 508f9997..19918d8b 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -2,58 +2,67 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 
 cd $p
 
-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
-}
+: 'non-dgit upload (but we prepare it with dgit anyway)'
+
+v=2.0-2+nmu1
+t-nmu-upload-1 nmu
+gbp pq import
+t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
+
+: 'done the nmu, switching back to the maintainer hat'
 
+nmu-fold () {
+	t-git-next-date
+	t-dgit fetch
+	t-git-next-date
+	git merge --ff-only dgit/dgit/sid
 
-nmu-upload-2 () {
-	t-dch-commit -v $v -m "nmu $nmubranch $v"
-	t-some-changes "nmu $numbranch $v"
-	t-dch-commit -r sid
+	git diff --exit-code patch-queue/$nmubranch
 
-	t-dgit -wgf build-source
+	git branch unlaundered.$nmubranch
 
-	cd ..
-	c=${p}_${v}_source.changes
-	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-	dput -c $tmp/dput.cf test-dummy $c
+	t-git-debrebase
+	t-gdr-good laundered
 
-	t-archive-process-incoming sid
-	cd $p
-	git checkout master
+	t-git-debrebase stitch
+	t-gdr-good stitched
 }
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
+nmu-fold
 
-v=2.0-2+nmu1
-nmu-upload-1 nmu
-gbp pq import
-nmu-upload-2
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
 
-: 'done the nmu, switching back to the maintainer hat'
+: 'now test a new upstream'
+
+t-make-new-upstream-tarball 2.1
 
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+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
 
-git diff --exit-code patch-queue/nmu
+#t-dgit -wgf build-source
 
-git branch t.before
+t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
 
-t-git-debrebase
-t-gdr-good laundered
+: 'done the nmu, back to the maintainer'
 
-t-git-debrebase stitch
-t-gdr-good stitched
+nmu-fold
 
 t-ok