X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=bf94fbaedc4c21529b705af2bc0b561cd13b4ddb;hb=193cfa37a544a2c44f9252b83da54ca1af01c01f;hp=bda2679ab235468a0a0f2b99be1e122249acdb70;hpb=4323fe5c8a3904f55b18e516b6b02a8e3e0527e4;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index bda2679a..bf94fbae 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -3,6 +3,8 @@
 : ${GDR_TEST_DEBUG=-D}
 export GDR_TEST_DEBUG
 
+t-tstunt debchange
+
 t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
@@ -21,14 +23,20 @@ t-gdr-good () {
 	#   stitched
 	#   pushed
 
+	case $state in
+	pushed*)
+		t-gdr-made-patches
+		;;
+	esac
+
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
 	LC_MESSAGES=C t-git-debrebase status >../status.check
 	case $state in
-	laundered)
+	laundered*)
 		egrep '^  *branch is laundered' ../status.check
 		;;
-	stitched|pushed)
+	stitched*|pushed*)
 		egrep \
  '^  *branch contains furniture|^  *branch is unlaundered|^  *branch needs laundering' ../status.check
 		egrep '^  stitched$' ../status.check
@@ -57,6 +65,7 @@ t-gdr-good-analyse () {
 	pushed)		etypes=AddPatches-Pseudomerge-Upstream ;;
 	pushed-interop)	etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
 	breakwater)	etypes=Packaging ;;
+	*)		fail-unknown-state-$state ;;
 	esac
 
 	anal=../anal$wsfx
@@ -220,11 +229,9 @@ t-some-changes () {
 t-make-new-upstream-tarball () {
 	local uv=$1
 	git checkout make-upstream
-	# leaves ust set to filename of orig tarball
 	echo "upstream $uv" >>docs/README
 	git commit -a -m "upstream $uv tarball"
-	ust=example_$uv.orig.tar.gz
-	git archive -o ../$ust --prefix=example-2.0/ make-upstream
+	t-make-orig example $uv make-upstream
 }
 
 t-nmu-upload-1 () {
@@ -253,17 +260,7 @@ t-nmu-upload-2 () {
 
 t-nmu-upload-3 () {
 	t-dch-commit-r
-
-	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
+	t-non-dgit-upload
 	git checkout master
 }
 
@@ -344,6 +341,10 @@ t-gdr-gbp-import-core () {
 	git add debian
 	git commit -m "an upstream retcon ($0)"
 	git tag v1.0
+}
+
+t-gdr-gbp-import-core-with-queue () {
+	t-gdr-gbp-import-core
 
 	: 'fake up that our quilt-tip was descended from upstream'
 	git checkout quilt-tip
@@ -359,3 +360,8 @@ t-gdr-gbp-import-core () {
 	git branch -D master
 	git branch -m quilt-tip master
 }
+
+t-gdr-made-patches () {
+	git log -n1 --'pretty=format:%B' \
+	| egrep '^\[git-debrebase'
+}