X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=e710f39dc660f8d1d065a3c46c08d5fb93449f19;hp=0ae9bbc281374fc4b1f23b92aa54f3799e48b712;hb=e3c09bcf8e8187254d2cfd3fa30e9db2d2f31887;hpb=84026aec1f98aaeb69a751c89a25c55b355c7ee8

diff --git a/tests/lib b/tests/lib
index 0ae9bbc2..e710f39d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -2,6 +2,7 @@
 
 exec 2>&1
 set -x
+set -o pipefail
 
 . tests/lib-core
 
@@ -33,6 +34,8 @@ mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 
+export DEBCHANGE_VENDOR=dpkg
+
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 [test-dummy]
@@ -43,9 +46,71 @@ 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-expect-push-fail () {
+	local mpat="$1"; shift
+
+	local triedpush=`git rev-parse HEAD`
+
+	t-reporefs pre-push
+	t-expect-fail "$mpat"  "$@"
+	t-reporefs post-push
+	diff $tmp/show-refs.{pre,post}-push
+
+	t-git-objects-not-present '' $triedpush
+
+	eval "$t_expect_push_fail_hook"
+}
+
+t-git-objects-not-present () {
+	# t-git-objects-not-present GITDIR|'' OBJID [...]
+	# specifying '' means the repo for package $p
+	local gitdir="${1-$tmp/git/$p.git}"
+	local obj
+	if ! [ -e "$gitdir" ]; then return; fi
+	for obj in "$@"; do
+		GIT_DIR=$gitdir \
+		t-expect-fail 'unable to find' \
+		git cat-file -t $obj
+	done
+}
+
+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 () {
@@ -92,7 +157,7 @@ t-prep-newpackage () {
 	t-git-none
 	t-worktree $v
 	cd $p
-	if ! git-show-ref --verify --quiet refs/heads/master; then
+	if ! git show-ref --verify --quiet refs/heads/master; then
 		git branch -m dgit/sid master
 		git remote rm dgit
 	fi
@@ -239,13 +304,23 @@ t-clean-on-branch () {
 	t-output "## $1" git status -b --porcelain
 }
 
+t-git-get-ref-exact () {
+	local ref=$1
+	# does not dereference, unlike t-git-get-ref
+	case "$ref" in
+	refs/*) ;;
+	*) fail "t-git-get-ref-exact bad $ref" ;;
+	esac
+	git for-each-ref --format='%(objectname)' "[r]efs/${ref#refs/}"
+}
+
 t-git-get-ref () {
 	local ref=$1
 	case "$ref" in
 	refs/*)	;;
 	*) fail "t-git-get-ref bad $ref" ;;
 	esac
-	git show-ref -d $1 | perl -ne '
+	(git show-ref -d $1 || test $? = 1) | perl -ne '
 		$x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
 		END { print "$x\n" if length $x; }
 	'
@@ -360,6 +435,15 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
+t-prep-mergechangelogs () {
+	local b=merge.dpkg-mergechangelogs
+	git config $b.name 'debian/changelog merge driver'
+	git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
+	mkdir -p .git/info
+	echo >>.git/info/attributes \
+		'debian/changelog merge=dpkg-mergechangelogs'
+}
+
 t-ref-dsc-dgit () {
 	local dsc=${p}_${v}.dsc
 	local val=`t-822-field $tmp/incoming/$dsc Dgit`
@@ -370,8 +454,9 @@ 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 () {
@@ -392,12 +477,16 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true
-	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
-	cp $root/tests/suites $tmp/.
+	cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $troot/suites $tmp/.
 
 	drs_dispatch=$tmp/distro=test-dummy
 	mkdir $drs_dispatch
-	ln -sf $root $drs_dispatch/dgit-live
+
+	if [ "x$DGIT_TEST_INTREE" != x ]; then
+		ln -sf "$DGIT_TEST_INTREE" $drs_dispatch/dgit-live
+	fi
+
 	ln -sf $tmp/git $drs_dispatch/repos
 	ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
 	mkdir -p $drs_dispatch/keyrings
@@ -427,10 +516,18 @@ t-policy-admin () {
 	${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
 }
 
+t-policy-nonexist () {
+	ln -sf no-such-file-or-directory $drs_dispatch/policy-hook
+}
+
 t-policy () {
 	local policyhook=$1
-	ln -sf ${DGIT_INFRA_PFX}$policyhook \
-		$drs_dispatch/policy-hook
+	policyhook=${DGIT_INFRA_PFX}$policyhook
+	case $policyhook in
+	*/*) 	;;
+	*)	policyhook=`type -P $policyhook` ;;
+	esac
+	ln -sf "$policyhook" $drs_dispatch/policy-hook
 }
 
 t-debpolicy () {