X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=0073df4123e56ea48014c11e73be87184c42b057;hp=baf3e4625cea893d4454f991cc5c58536d4686af;hb=2711b56a97437d8260ccac48b0699a8bfe9764a1;hpb=d6156841cf81c364e2c7f1b16e74bfb64cf8afe2

diff --git a/tests/lib b/tests/lib
index baf3e462..0073df41 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1,10 +1,18 @@
 #
 
 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/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
 
 root=`pwd`
 troot=$root/tests
-testname="${0##*/}"
+testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -14,39 +22,118 @@ if [ x"$tmp" = x ]; then
 	mkdir $tmp
 fi
 cd $tmp
+export HOME=$tmp
+
 tmp=`pwd`
 export DGIT_TEST_DUMMY_DIR=$tmp
-ln $troot/ssh ssh
+ln -f $troot/ssh ssh
 
-mkdir $tmp/gnupg
+mkdir -p $tmp/gnupg
+cp $troot/gnupg/* $tmp/gnupg
+chmod go-rw $tmp/gnupg/*
 export GNUPGHOME=$tmp/gnupg
 
+mkdir -p $tmp/incoming
+cat <<END >$tmp/dput.cf
+[test-dummy]
+method			= local
+incoming		= $tmp/incoming
+run_dinstall		= 0
+END
+
+fail () {
+	echo >&2 "failed: $*"
+	exit 1
+}
+
+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
+	t-untar $troot/worktrees/${p}_$1
+}
+
 t-git () {
-	mkdir -p git
-	cp -al $troot/git-srcs/$1 git/.
+	p=$1
+	v=$2
+	mkdir -p $tmp/git
+	local gs=$troot/git-srcs/${p}_$v.git
+	(set -e; cd $tmp/git; t-untar $gs)
 }
 
 t-git-none () {
-	mkdir -p git
+	mkdir -p $tmp/git
+	(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
 }
 
-t-archive () {
+t-has-ancestor () {
+	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
+		fail "not ff $ancestor..$now, $mbase != $ancestor"
+	fi
+}	
+
+t-archive-none () {
 	p=$1
-	mkdir -p aq mirror
+	mkdir -p $tmp/aq $tmp/mirror
+	echo sid >$tmp/aq/suite.unstable
+}
+
+t-archive-process-incoming () {
+	mv incoming/${p}_${v}[._]* mirror/
+	t-archive-query
+}
+
+t-archive-query () {
+	local dscf=${p}_${v}.dsc
+	echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+}
+
+t-archive () {
+	t-archive-none $1
+	v=$2
 	local dscf=${p}_$2.dsc
-	ln $troot/pkg-srcs/${p}_${2%-*}* mirror/
-	echo sid >aq/suite.unstable
-	echo "$2 $dscf" >>aq/package.sid.${p}
-	mkdir extract
-	(set -e; cd extract; dpkg-source -x ../mirror/$dscf)
+	rm -f $tmp/mirror/${p}_*
+	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
+	t-archive-query
+	rm -rf $tmp/extract
+	mkdir $tmp/extract
+	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
 }
 
 t-dgit () {
-	${DGIT_TEST-dgit} --dget:-u -dtest-dummy "$@"
+	local dgit=${DGIT_TEST-dgit}
+	: '
+{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
+		-dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+		-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
+	t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
 }
 
 t-output () {
@@ -60,12 +147,133 @@ t-clean-on-branch () {
 	t-output "## $1" git status -b --porcelain
 }
 
+t-git-get-ref () {
+	local ref=$1
+	git show-ref -d $1 | perl -ne '
+		$x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
+		END { print "$x\n" if length $x; }
+	'
+}
+
+t-ref-same () {
+	local name="$1"
+	local val=`t-git-get-ref $name`
+	t-ref-same-val "$name" $val
+}
+
+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 f=$1
-	git rev-parse $f >$tmp/t.ref1
 	local g
 	for g in $*; do
-		git rev-parse $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
+		val=`t-git-get-ref $g >$tmp/t.refx`
+		if [ "x$val" != x ]; then
+			fail "ref $g unexpectedly exists ($val)"
+		fi
+	done
+}
+
+t-v-tag () {
+	echo refs/tags/debian/${v//\~/_}
+}
+
+t-pushed-good () {
+	local branch=$1
+	t-ref-dsc-dgit
+	t-refs-same \
+		refs/heads/$branch \
+		`t-v-tag` \
+		refs/remotes/dgit/dgit/sid
+	t-refs-notexist \
+		refs/heads/dgit/unstable \
+		refs/remotes/dgit/dgit/unstable
+	(set -e; cd $tmp/git/$p.git
+	 t-refs-same \
+		refs/dgit/sid \
+		`t-v-tag`
+	 t-refs-notexist \
+		refs/dgit/unstable
+	)
+	git verify-tag `t-v-tag`
+}
+
+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,"'"$file"'");
+		my $val = $h->{"'$field'"},"\n";
+		die "'"$file $field"'" unless defined $val;
+		print $val,"\n";
+	' <$file
+}
+
+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 () {
+	local v1=$1
+	local v2=$2
+	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
+		| patch -p1 -u
+}
+
+t-git-config () {
+	git config --global "$@"
+}
+
+t-drs () {
+	export DGIT_TEST_TROOT=$troot
+	export DGIT_TEST_TMP=$tmp
+ 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/.
+}
+
+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#*-}"
+}