X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=1d2d06ade6fd4a6fa1857b2d4360822c92eb4139;hp=baf3e4625cea893d4454f991cc5c58536d4686af;hb=c2d43f9859a861f8522c32bb42e9f74fd229b6bf;hpb=d6156841cf81c364e2c7f1b16e74bfb64cf8afe2

diff --git a/tests/lib b/tests/lib
index baf3e462..1d2d06ad 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1,6 +1,7 @@
 #
 
 exec 2>&1
+set -x
 
 root=`pwd`
 troot=$root/tests
@@ -19,36 +20,76 @@ export DGIT_TEST_DUMMY_DIR=$tmp
 ln $troot/ssh ssh
 
 mkdir $tmp/gnupg
+cp $troot/gnupg/* $tmp/gnupg
+chmod go-rw $tmp/gnupg/*
 export GNUPGHOME=$tmp/gnupg
 
-t-git () {
-	mkdir -p git
-	cp -al $troot/git-srcs/$1 git/.
+mkdir $tmp/incoming
+cat <<END >$tmp/dput.cf
+[test-dummy]
+method			= local
+incoming		= $tmp/incoming
+run_dinstall		= 0
+END
+
+t-worktree () {
+	rm -rf $p
+	tar xf $troot/worktrees/${p}_$1.tar
 }
 
 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 ancestor=`git rev-parse $1`
+	local now=`git rev-parse HEAD`
+	local mbase=`git merge-base $ancestor $now`
+	if [ x$mbase != x$ancestor ]; then
+		echo "not ff $ancestor..$now, $mbase != $ancestor"
+		exit 1
+	fi
+}	
+
+t-archive-none () {
 	p=$1
-	mkdir -p aq mirror
+	mkdir -p $tmp/aq $tmp/mirror
+	echo sid >$tmp/aq/suite.unstable
+}
+
+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/
+	echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+	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 "$@"
+	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
+		-dtest-dummy -D -k39B13D8A "$@"
+	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
 }
 
 t-diff-nogit () {
 	diff --exclude=.git -ruN $*
 }
 
+t-cloned-fetched-good () {
+	t-diff-nogit ../extract/$p-${v%-*} .
+	t-clean-on-branch dgit/sid
+	t-refs-same \
+		refs/heads/dgit/sid \
+		refs/remotes/dgit/dgit/sid
+	t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
+}
+
 t-output () {
 	printf "%s\n" "$1" >$tmp/t.want
 	shift
@@ -60,12 +101,60 @@ 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-refs-same () {
 	local f=$1
-	git rev-parse $f >$tmp/t.ref1
+	t-git-get-ref $f >$tmp/t.ref1
+	t-refs-same-more "$@"
+}
+
+t-refs-same-more () {
 	local g
 	for g in $*; do
-		git rev-parse $g >$tmp/t.refn
+		t-git-get-ref $g >$tmp/t.refn
 		diff $tmp/t.ref1 $tmp/t.refn
 	done
 }
+
+t-refs-notexist () {
+	for g in $*; do
+		t-git-get-ref $g >$tmp/t.refx
+		diff /dev/null $tmp/t.refx
+	done
+}
+
+t-pushed-good () {
+	t-ref-dsc-dgit
+	t-refs-same-more \
+		refs/heads/master \
+		refs/tags/debian/$v \
+		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-more \
+		refs/dgit/sid \
+		refs/tags/debian/$v
+	 t-refs-notexist \
+		refs/dgit/unstable
+	)
+}
+
+t-ref-dsc-dgit () {
+	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
+}