X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=377c5fd1e4dd93a71bef4ff4d1fbf438e3fa65d1;hp=29812f794850e7c4fb86b117cfb25151723afc87;hb=5e5ac359fd22d5e35916471468ab7f56fec9fc82;hpb=d5013886bfac8d8997d1e4ec8fd32f1a0a6e62d1

diff --git a/tests/lib b/tests/lib
index 29812f79..377c5fd1 100644
--- a/tests/lib
+++ b/tests/lib
@@ -3,12 +3,12 @@
 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}
-	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
 
 root=`pwd`
 troot=$root/tests
@@ -22,9 +22,9 @@ if [ x"$tmp" = x ]; then
 	mkdir $tmp
 fi
 cd $tmp
-export HOME=$tmp
 
 tmp=`pwd`
+export HOME=$tmp
 export DGIT_TEST_DUMMY_DIR=$tmp
 ln -f $troot/ssh ssh
 
@@ -41,9 +41,11 @@ 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
+	test ${PIPESTATUS[0]} != 0
+	egrep "$mpat" $tmp/t.output ||false
 }
 
 t-untar () {
@@ -81,34 +83,96 @@ t-has-ancestor () {
 	if [ x$mbase != x$ancestor ]; then
 		fail "not ff $ancestor..$now, $mbase != $ancestor"
 	fi
-}	
+}
+
+t-prep-newpackage () {
+	p=$1
+	v=$2
+	t-archive-none $p
+	t-git-none
+	t-worktree $v
+	cd $p
+	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
-	echo sid >$tmp/aq/suite.unstable
+	mkdir -p $tmp/aq $tmp/mirror/pool/main
+
+	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
+[
+   {
+      "archive" : "ftp-master",
+      "codename" : "sid",
+      "components" : [
+         "main",
+         "contrib",
+         "non-free"
+      ],
+      "name" : "unstable",
+      "dakname" : "unstable"
+   }
+]
+END
+}
+
+t-archive-updated () {
+	local suite=$1
+	local p=$2
+	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;
+		m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die;
+		push @v, {
+			"version" => "$1",
+			"sha256sum" => "$2",
+			"component" => "$3",
+			"filename" => "$4",
+		};
+		END {
+			print to_json \@v or die $!;
+		}
+	'
 }
 
 t-archive-process-incoming () {
-	mv incoming/${p}_${v}[._]* mirror/
+	mv incoming/${p}_${v}[._]* mirror/pool/main/
 	t-archive-query
 }
 
 t-archive-query () {
-	local dscf=${p}_${v}.dsc
-	echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+	local dscf=main/${p}_${v}.dsc
+	local sha=`sha256sum <mirror/pool/$dscf`
+	echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.sid.${p}
+	t-archive-updated sid $p
 }
 
 t-archive () {
 	t-archive-none $1
 	v=$2
 	local dscf=${p}_$2.dsc
-	rm -f $tmp/mirror/${p}_*
-	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
+	rm -f $tmp/mirror/pool/main/${p}_*
+	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
 	t-archive-query
 	rm -rf $tmp/extract
 	mkdir $tmp/extract
-	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
+	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
 }
 
 t-dgit () {
@@ -116,7 +180,7 @@ t-dgit () {
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+		-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-k39B13D8A "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
@@ -261,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 () {
@@ -277,17 +351,26 @@ 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 () {
+	${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
+}
+
+t-debpolicy () {
+	t-dsd
+
+	ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
+		$drs_dispatch/policy-hook
+
+	mkdir $tmp/git
+	t-policy-admin create-db
+}
+
+t-policy-periodic () {
+	${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+		test-dummy $drs_dispatch '' --cron
 }
 
 t-chain-test () {