X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=e710f39dc660f8d1d065a3c46c08d5fb93449f19;hp=70ad0b186d31ecc244717b355bd99ee02e160329;hb=76cbbc78a07e44b4c917bbaa93bf7cd602387082;hpb=600129df470efe1399947a2022ce5bbdc009b7bb

diff --git a/tests/lib b/tests/lib
index 70ad0b18..e710f39d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -34,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]
@@ -155,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
@@ -481,16 +483,10 @@ t-drs () {
 	drs_dispatch=$tmp/distro=test-dummy
 	mkdir $drs_dispatch
 
-	if [ "x$DGIT_TEST_INTREE" = x ]; then
-		cat >&2 <<END
-dgit-repos-server is designed to run out of a git working tree
-cannot be tested in installed package (as DEP-8-intends)
-test skipped
-END
-		exit 0
+	if [ "x$DGIT_TEST_INTREE" != x ]; then
+		ln -sf "$DGIT_TEST_INTREE" $drs_dispatch/dgit-live
 	fi
 
-	ln -sf $root $drs_dispatch/dgit-live
 	ln -sf $tmp/git $drs_dispatch/repos
 	ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
 	mkdir -p $drs_dispatch/keyrings
@@ -520,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 () {