X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=f1ffa8b11563219b2f3082a591fca04ed4d16c9c;hb=46f49961006d814869d975d5d982cd7d3c107b0b;hp=48bc237347fe00a525110bc5d8f788b2f1dd6ebd;hpb=e336da03c1d9568dc889e18659c483d5eb047c99;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 48bc2373..f1ffa8b1 100644
--- a/tests/lib
+++ b/tests/lib
@@ -7,6 +7,20 @@ set -o pipefail
 . tests/lib-core
 . tests/lib-restricts
 
+t-report-failure () {
+	set +x
+	rc=$1
+	cat <<END >&2
+TEST FAILED
+funcs: ${FUNCNAME[*]}
+lines: ${BASH_LINENO[*]}
+files: ${BASH_SOURCE[*]}
+END
+	exit 16
+}
+
+trap 'test $? = 0 || t-report-failure' EXIT
+
 t-set-intree
 
 : ${DGIT_TEST_DEBUG=-D}
@@ -48,6 +62,8 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
+: ${tagpfx:=test-dummy}
+
 t-git-next-date () {
 	GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
 	GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
@@ -237,7 +253,8 @@ t-archive-updated () {
 			"filename" => "$4",
 		};
 		END {
-			print to_json \@v or die $!;
+			my $json = JSON->new->canonical();
+			print $json->encode(\@v) or die $!;
 		}
 	'
 }
@@ -385,7 +402,8 @@ t-ref-same-val () {
 	case "$t_ref_val" in
 	'')		;;
 	"$val")		;;
-	*)		fail "ref varies: $name: $val != $t_ref_val" ;;
+	*)		fail "ref varies: $name:\
+ ${val:-nothing} != ${t_ref_val:-nothing}" ;;
 	esac
 	t_ref_val="$val"
 }
@@ -412,7 +430,7 @@ t-refs-notexist () {
 }
 
 t-v-tag () {
-	echo refs/tags/test-dummy/${v//\~/_}
+	echo refs/tags/$tagpfx/${v//\~/_}
 }
 
 t-check-pushed-master () {
@@ -512,6 +530,52 @@ t-apply-diff () {
 	 | patch -p1 -u
 }
 
+t-gbp-unapplied-pq2qc () {
+	# does `gbp pq export'
+	# commits the resulting debian/patches on  qc/BRANCH
+	# leaves us on qc/BRANCH (eg "qc/quilt-tip"))
+	# qc/BRANCH is not fast-forwarding
+
+	gbp pq export
+
+	branch=`git symbolic-ref HEAD`
+	branch=${branch#refs/heads/}
+
+	case "$branch" in
+	*/*) fail "unexpected branch $branch" ;;
+	esac
+
+	git branch -f qc/$branch
+	git checkout qc/$branch
+	git add debian/patches
+	git commit -m 'Commit patch queue'
+}
+
+t-gbp-example-prep () {
+	t-archive example 1.0-1
+	t-git-none
+	t-worktree 1.0
+
+	cd example
+
+	t-dgit fetch
+
+	git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+	gbp pq rebase
+
+	echo '/* some comment */' >>src.c
+	git add src.c
+	git commit -m 'Add a comment to an upstream file'
+
+	t-gbp-unapplied-pq2qc
+
+	t-commit 'some updates' 1.0-2
+
+	git merge -s ours \
+		-m 'Pseudo-merge to make descendant of archive' \
+		remotes/dgit/dgit/sid
+}
+
 t-commit () {
 	local msg=$1
 	v=${2-1.$revision}
@@ -551,6 +615,14 @@ t-drs () {
 	ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
+t-newtag () {
+ export tagpfx=archive/test-dummy
+ t-git-config dgit-distro.test-dummy.dgit-tag-format new
+}
+t-oldtag () {
+ t-git-config dgit-distro.test-dummy.dgit-tag-format old
+}
+
 t-dsd () {
 	t-drs
  t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"