X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=b9ce24be192486df55ee2da1ef064f03ace208d7;hp=8823b287ba555d873f30405b84b59aee1b9eb8e8;hb=d064fe28e62e45dca47b9925eac285e7b7becc5d;hpb=aa763397e6222caf15f1f4c86e05162b8764f3dc

diff --git a/tests/lib b/tests/lib
index 8823b287..b9ce24be 100644
--- a/tests/lib
+++ b/tests/lib
@@ -20,8 +20,18 @@ 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
 
+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
@@ -29,6 +39,7 @@ t-worktree () {
 
 t-git-none () {
 	mkdir -p $tmp/git
+	(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
 }
 
 t-has-ancestor () {
@@ -41,14 +52,18 @@ t-has-ancestor () {
 	fi
 }	
 
-t-archive () {
+t-archive-none () {
 	p=$1
-	v=$2
 	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
 	rm -f $tmp/mirror/${p}_*
 	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
-	echo sid >$tmp/aq/suite.unstable
 	echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
 	rm -rf $tmp/extract
 	mkdir $tmp/extract
@@ -57,7 +72,8 @@ t-archive () {
 
 t-dgit () {
 	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	${DGIT_TEST-dgit} --dget:-u -dtest-dummy -D "$@"
+	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
+		-dtest-dummy -D -k39B13D8A "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
 }
 
@@ -68,7 +84,10 @@ t-diff-nogit () {
 t-cloned-fetched-good () {
 	t-diff-nogit ../extract/$p-${v%-*} .
 	t-clean-on-branch dgit/sid
-	t-refs-same HEAD remotes/dgit/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 () {
@@ -82,12 +101,68 @@ 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 () {
+	local branch=$1
+	t-ref-dsc-dgit
+	t-refs-same-more \
+		refs/heads/$branch \
+		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
+}
+
+t-apply-diff () {
+	local v1=$1
+	local v2=$2
+	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
+		| patch -p1 -u
+}