X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=e6ca6fb399b4a5b6167bbddd3bf4263606a037ea;hp=4a40e7769ec34177e393f6421ac916127f840361;hb=df2685b0b8364f6dfed541113478bbd23a175a01;hpb=39dafe5aef79bef3817c0d3fabc001b244a9dcc5

diff --git a/tests/lib b/tests/lib
index 4a40e776..e6ca6fb3 100644
--- a/tests/lib
+++ b/tests/lib
@@ -3,9 +3,16 @@
 exec 2>&1
 set -x
 
+. tests/lib-core
+
+t-set-intree
+
+: ${DGIT_TEST_DEBUG:=-D}
+export DGIT_TEST_DEBUG
+
 root=`pwd`
 troot=$root/tests
-testname="${0##*/}"
+testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -15,16 +22,18 @@ if [ x"$tmp" = x ]; then
 	mkdir $tmp
 fi
 cd $tmp
+
 tmp=`pwd`
-export DGIT_TEST_DUMMY_DIR=$tmp
-ln $troot/ssh ssh
 
-mkdir $tmp/gnupg
+t-set-using-tmp
+
+ln -f $troot/ssh ssh
+
+mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
-export GNUPGHOME=$tmp/gnupg
 
-mkdir $tmp/incoming
+mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 [test-dummy]
 method			= local
@@ -32,14 +41,34 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
+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 () {
+	local tarfile=$1.tar
+	local edittree=$1.edit
+	if test -d "$edittree"; then
+		cp -al "$edittree"/* .
+	else
+		tar xf "$tarfile"
+	fi
+}
+
 t-worktree () {
 	rm -rf $p
-	tar xf $troot/worktrees/${p}_$1.tar
+	t-untar $troot/worktrees/${p}_$1
 }
 
 t-git () {
+	p=$1
+	v=$2
 	mkdir -p $tmp/git
-	(set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
+	local gs=$troot/git-srcs/${p}_$v.git
+	(set -e; cd $tmp/git; t-untar $gs)
 }
 
 t-git-none () {
@@ -48,47 +77,151 @@ t-git-none () {
 }
 
 t-has-ancestor () {
-	local ancestor=`git rev-parse $1`
 	local now=`git rev-parse HEAD`
+	local ancestor=`git rev-parse $1^{}`
 	local mbase=`git merge-base $ancestor $now`
 	if [ x$mbase != x$ancestor ]; then
-		echo "not ff $ancestor..$now, $mbase != $ancestor"
-		exit 1
+		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 () {
+	local suite=$1
+	mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+	t-archive-query "$suite"
+}
+
+t-archive-query () {
+	local suite=${1-sid}
+	local dscf=main/${p}_${v}.dsc
+	local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+	echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.$suite.${p}
+	t-archive-updated $suite $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/
-	echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+	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-git-dir-time-passes () {
+	touch -d 'last year' $tmp/git/$p.git
+}
+
+t-git-dir-check () {
+	local gitdir=$tmp/git/$p.git
+	case "$1" in
+	enoent)
+		if test -e "$gitdir"; then fail "$gitdir exists"; fi
+		return
+		;;
+	public) wantstat='7[75]5' ;;
+	secret)	wantstat='7[70]0' ;;
+	*)	fail "$1 t-git-dir-check ?" ;;
+	esac
+	gotstat=`stat -c%a $gitdir`
+	case "$gotstat" in
+	*$wantstat) return ;;
+	*)	fail "$gitdir has mode $gotstat, expected $wantstat" ;;
+	esac
+}
+
+t-rm-dput-dropping () {
+	rm -f $tmp/${p}_${v}_*.upload
 }
 
 t-dgit () {
-	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy -D -k39B13D8A "$@"
-	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+	local dgit=${DGIT_TEST-dgit}
+	: '
+{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
+		-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+		-k39B13D8A "$@"
+	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+'
 }
 
 t-diff-nogit () {
-	diff --exclude=.git -ruN $*
+	diff --exclude=.git --exclude=.pc -ruN $*
 }
 
 t-cloned-fetched-good () {
 	t-diff-nogit ../extract/$p-${v%-*} .
 	t-clean-on-branch dgit/sid
+	t-refs-same-start
 	t-refs-same \
 		refs/heads/dgit/sid \
 		refs/remotes/dgit/dgit/sid
@@ -114,24 +247,46 @@ t-git-get-ref () {
 	'
 }
 
-t-refs-same () {
-	local f=$1
-	t-git-get-ref $f >$tmp/t.ref1
-	t-refs-same-more "$@"
+t-ref-same () {
+	local name="$1"
+	local val=`t-git-get-ref $name`
+	t-ref-same-val "$name" $val
 }
 
-t-refs-same-more () {
+t-ref-head () {
+	local val=`git rev-parse HEAD`
+	t-ref-same-val HEAD $val
+}
+
+t-ref-same-val () {
+	local name="$1"
+	local val=$2
+	case "$t_ref_val" in
+	'')		;;
+	"$val")		;;
+	*)		fail "ref varies: $name: $val != $t_ref_val" ;;
+	esac
+	t_ref_val="$val"
+}
+
+t-refs-same-start () {
+	t_ref_val=''
+}
+
+t-refs-same () {
 	local g
 	for g in $*; do
-		t-git-get-ref $g >$tmp/t.refn
-		diff $tmp/t.ref1 $tmp/t.refn
+		t-ref-same $g
 	done
 }
 
 t-refs-notexist () {
+	local val
 	for g in $*; do
-		t-git-get-ref $g >$tmp/t.refx
-		diff /dev/null $tmp/t.refx
+		val=`t-git-get-ref $g >$tmp/t.refx`
+		if [ "x$val" != x ]; then
+			fail "ref $g unexpectedly exists ($val)"
+		fi
 	done
 }
 
@@ -142,7 +297,7 @@ t-v-tag () {
 t-pushed-good () {
 	local branch=$1
 	t-ref-dsc-dgit
-	t-refs-same-more \
+	t-refs-same \
 		refs/heads/$branch \
 		`t-v-tag` \
 		refs/remotes/dgit/dgit/sid
@@ -150,7 +305,7 @@ t-pushed-good () {
 		refs/heads/dgit/unstable \
 		refs/remotes/dgit/dgit/unstable
 	(set -e; cd $tmp/git/$p.git
-	 t-refs-same-more \
+	 t-refs-same \
 		refs/dgit/sid \
 		`t-v-tag`
 	 t-refs-notexist \
@@ -159,15 +314,53 @@ t-pushed-good () {
 	git verify-tag `t-v-tag`
 }
 
-t-ref-dsc-dgit () {
+t-822-field () {
+	local file=$1
+	local field=$2
 	perl -e '
 		use Dpkg::Control::Hash;
 		my $h = new Dpkg::Control::Hash allow_pgp=>1;
-		$h->parse(\*STDIN,"dsc");
-		my $ref = $h->{"Dgit"},"\n";
-		die unless $ref =~ m/^\w+\b/;
-		print $ref,"\n";
-	' <$tmp/incoming/${p}_${v}.dsc >$tmp/t.ref1
+		$h->parse(\*STDIN,"'"$file"'");
+		my $val = $h->{"'$field'"},"\n";
+		die "'"$file $field"'" unless defined $val;
+		print $val,"\n";
+	' <$file
+}
+
+t-stunt-envvar () {
+	local var=$1
+	local tstunt=$2
+	eval '
+		case "'$var'" in
+		"$tstunt:"*)	;;
+		*":$tstunt:"*)	;;
+		*)		'$var'="$tstunt:$'$var'" ;;
+		esac
+	'
+}
+
+t-tstunt () {
+	local tstunt=$tmp/tstunt
+	t-stunt-envvar PATH $tstunt
+	t-stunt-envvar PERLLIB $tstunt
+	local f
+	for f in "$@"; do
+		f="./$f"
+		local d="$tstunt/${f%/*}"
+		mkdir -p $d
+		ln -sf "$troot/tstunt/$f" "$d"/.
+	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`
+	perl -e '$_=shift @ARGV; die "$dsc Dgit $_ ?" unless m/^\w+\b/;' "$val"
+	t-ref-same-val $dsc "$val"
 }
 
 t-apply-diff () {
@@ -176,3 +369,90 @@ t-apply-diff () {
 	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
 		| 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 () {
+	git config --global "$@"
+}
+
+t-drs () {
+	export DGIT_TEST_TROOT=$troot
+ 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/.
+
+	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 () {
+	t-drs
+ t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"
+ t-git-config dgit-distro.test-dummy.git-check ssh-cmd
+ t-git-config dgit-distro.test-dummy.git-create true
+ t-git-config dgit-distro.test-dummy.git-url \
+		"ext::$troot/dsd-ssh X %S /dgit/test-dummy/repos"
+
+ t-git-config dgit-distro.test-dummy.diverts.drs /drs
+ t-git-config dgit-distro.test-dummy/drs.ssh "$troot/ssh"
+ t-git-config dgit-distro.test-dummy/drs.git-url $tmp/git
+ t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
+ t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
+
+	echo 'no-such-package* drs' >$drs_dispatch/diverts
+}
+
+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
+	t-policy dgit-repos-policy-debian
+
+	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 () {
+	local ct=$1
+	local d=${0%/*}
+	cd $root
+	export DGIT_TEST_TESTNAME="$testname"
+	export ADTTMP=$tmp
+	exec "$d/$ct"
+}	
+
+t-alt-test () {
+	local t=${0##*/}
+	t-${t%%-*}
+	t-chain-test "${t#*-}"
+}