X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=abb2657a23bd6ee2c993422fe30819656d152f06;hb=c4e6f46a26de88f746cbbda6af94821242d71bf2;hp=87de19a0af66f70b911917e2bfa1b73841452187;hpb=9ff6957e842708e9641ad00510f336b347bff302;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 87de19a0..abb2657a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -3,13 +3,9 @@
 exec 2>&1
 set -x
 
-if [ "x$DGIT_TEST_INTREE" != x ]; then
-	: ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
-	: ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
-	: ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
-	: ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
-	export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
-fi
+. tests/lib-core
+
+t-set-intree
 
 : ${DGIT_TEST_DEBUG:=-D}
 export DGIT_TEST_DEBUG
@@ -45,11 +41,6 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
-fail () {
-	echo >&2 "failed: $*"
-	exit 1
-}
-
 t-expect-fail () {
 	local mpat="$1"; shift
 	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
@@ -99,23 +90,27 @@ t-prep-newpackage () {
 	v=$2
 	t-archive-none $p
 	t-git-none
-	v=3-1
 	t-worktree $v
 	cd $p
-	git branch -m dgit/sid master
-	git remote rm dgit
+	if ! git-show-ref --verify --quiet refs/heads/master; then
+		git branch -m dgit/sid master
+		git remote rm dgit
+	fi
 	cd ..
 }
 
 t-archive-none () {
 	p=$1
 	mkdir -p $tmp/aq $tmp/mirror/pool/main
-	mkdir -p $tmp/aq/dsc_in_suite $tmp/aq/dsc_in_suite/sid
 
 	local suite=sid
+
 	>$tmp/aq/package.$suite.$p
 	t-archive-updated $suite $p
 
+	>$tmp/aq/package.new.$p
+	t-archive-updated new $p
+
 	ln -s sid $tmp/aq/dsc_in_suite/unstable
 	cat <<'END' >$tmp/aq/suites
 [
@@ -137,7 +132,9 @@ END
 t-archive-updated () {
 	local suite=$1
 	local p=$2
-	perl <$tmp/aq/package.$suite.$p >$tmp/aq/dsc_in_suite/$suite/$p -wne '
+	local suitedir=$tmp/aq/dsc_in_suite/$suite
+	mkdir -p $suitedir
+	perl <$tmp/aq/package.$suite.$p >$suitedir/$p -wne '
 		use JSON;
 		use strict;
 		our @v;
@@ -328,6 +325,16 @@ t-drs () {
  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/.
+
+	drs_dispatch=$tmp/distro=test-dummy
+	mkdir $drs_dispatch
+	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
+	ln -sf $tmp/dd.gpg $drs_dispatch/keyrings/debian-keyring.gpg
+	ln -sf $tmp/dm.gpg $drs_dispatch/keyrings/debian-maintainers.gpg
+	ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
 t-dsd () {
@@ -344,17 +351,7 @@ t-dsd () {
  t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
 
-	dsd_dispatch=$tmp/dispatch-dir/distro=test-dummy
-	mkdir -p $dsd_dispatch
-	ln -sf $root $dsd_dispatch/dgit-live
-	ln -sf $tmp/git $dsd_dispatch/repos
-	ln -sf $tmp/suites $tmp/dm.txt $dsd_dispatch/
-	mkdir -p $dsd_dispatch/keyrings
-	ln -sf $tmp/dd.gpg $dsd_dispatch/keyrings/debian-keyring.gpg
-	ln -sf $tmp/dm.gpg $dsd_dispatch/keyrings/debian-maintainers.gpg
-	ln -sf /bin/true $dsd_dispatch/policy-hook
-
-	echo 'no-such-package* drs' >$dsd_dispatch/diverts
+	echo 'no-such-package* drs' >$drs_dispatch/diverts
 }
 
 t-policy-admin () {
@@ -365,7 +362,7 @@ t-debpolicy () {
 	t-dsd
 
 	ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
-		$dsd_dispatch/policy-hook
+		$drs_dispatch/policy-hook
 
 	mkdir $tmp/git
 	t-policy-admin create-db