X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=c91020bc3285a3e5545fe0e5d71b3d0340d42e8f;hp=5adcf0b69bca032a863bcec6f4c98aea34b8780a;hb=5d8e32854c1d89e337bc606d423634a667f9b0ff;hpb=6d69f86475d897aaf3b565d24ceaf21640c615f7

diff --git a/tests/lib b/tests/lib
index 5adcf0b6..c91020bc 100644
--- a/tests/lib
+++ b/tests/lib
@@ -2,6 +2,7 @@
 
 exec 2>&1
 set -x
+set -o pipefail
 
 . tests/lib-core
 
@@ -43,9 +44,43 @@ END
 
 t-expect-fail () {
 	local mpat="$1"; shift
+
+	local grepper=fgrep
+	case "$mpat" in
+	[A-Z]:*)
+		case "$mpat" in
+		E:*)	grepper=egrep	;;
+		F:*)	grepper=fgrep	;;
+		*)	fail "bad mpat prefix in $mpat";;
+		esac
+		mpat=${mpat#[A-Z]:}
+		;;
+	esac
+
+	set +o pipefail
 	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
-	test ${PIPESTATUS[0]} != 0
-	egrep "$mpat" $tmp/t.output ||false
+	local ps="${PIPESTATUS[*]}"
+	set -o pipefail
+
+	case $ps in
+	"0 0")	fail "command unexpectedly succeeded (instead of: $mpat)" ;;
+	*" 0")	;;
+	*)	fail "tee failed"  ;;
+	esac
+
+	$grepper -e "$mpat" $tmp/t.output ||
+		fail "error message not found"
+}
+
+t-reporefs () {
+	local whichoutput=$1; shift
+	local outputfile="$tmp/show-refs.$whichoutput"
+	(set -e
+	 exec >"$outputfile"
+	 if test -d $tmp/git/$p.git; then
+		cd $tmp/git/$p.git
+		git show-ref |sort
+	fi)
 }
 
 t-untar () {
@@ -199,6 +234,10 @@ t-git-dir-check () {
 	esac
 }
 
+t-rm-dput-dropping () {
+	rm -f $tmp/${p}_${v}_*.upload
+}
+
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
 	: '
@@ -221,7 +260,7 @@ t-cloned-fetched-good () {
 	t-refs-same \
 		refs/heads/dgit/sid \
 		refs/remotes/dgit/dgit/sid
-	t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
+	t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable
 }
 
 t-output () {
@@ -237,7 +276,11 @@ t-clean-on-branch () {
 
 t-git-get-ref () {
 	local ref=$1
-	git show-ref -d $1 | perl -ne '
+	case "$ref" in
+	refs/*)	;;
+	*) fail "t-git-get-ref bad $ref" ;;
+	esac
+	(git show-ref -d $1 || test $? = 1) | perl -ne '
 		$x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
 		END { print "$x\n" if length $x; }
 	'
@@ -348,6 +391,10 @@ t-tstunt () {
 	done
 }
 
+t-tstunt-parsechangelog () {
+	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
+}
+
 t-ref-dsc-dgit () {
 	local dsc=${p}_${v}.dsc
 	local val=`t-822-field $tmp/incoming/$dsc Dgit`
@@ -358,8 +405,18 @@ t-ref-dsc-dgit () {
 t-apply-diff () {
 	local v1=$1
 	local v2=$2
-	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
-		| patch -p1 -u
+	(cd $troot/pkg-srcs;
+	 debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc || test $? = 1) \
+	 | patch -p1 -u
+}
+
+t-commit () {
+	local msg=$1
+	v=1.$revision
+	dch -v$v --distribution unstable "$1"
+	git add debian/changelog
+	debcommit
+	revision=$(( $revision + 1 ))
 }
 
 t-git-config () {
@@ -406,11 +463,15 @@ t-policy-admin () {
 	${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
 }
 
+t-policy () {
+	local policyhook=$1
+	ln -sf ${DGIT_INFRA_PFX}$policyhook \
+		$drs_dispatch/policy-hook
+}
+
 t-debpolicy () {
 	t-dsd
-
-	ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
-		$drs_dispatch/policy-hook
+	t-policy dgit-repos-policy-debian
 
 	mkdir $tmp/git
 	t-policy-admin create-db