X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=b033dde2f78040b5a55ea06dd781d8fb1db5a772;hp=3ddb98051e85890572809e56172575275433e13f;hb=79fa5d666388c4a176c6c0dc50c9c6cff527840b;hpb=a56fc8384e1aaae7d279b74269b706156a6da962

diff --git a/tests/lib b/tests/lib
index 3ddb9805..b033dde2 100644
--- a/tests/lib
+++ b/tests/lib
@@ -42,6 +42,8 @@ if [ x"$tmp" = x ]; then
 	tmp=tests/tmp/$testname
 	rm -rf $tmp
 	mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+	tmpbase="$DGIT_TEST_TMPBASE"
 fi
 cd $tmp
 
@@ -53,10 +55,6 @@ env -0 >$tmp/.save-env
 
 ln -f $troot/ssh ssh
 
-mkdir -p $tmp/gnupg
-cp $troot/gnupg/* $tmp/gnupg
-chmod go-rw $tmp/gnupg/*
-
 export DEBCHANGE_VENDOR=dpkg
 
 mkdir -p $tmp/incoming
@@ -67,7 +65,8 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
-: ${tagpfx:=test-dummy}
+: ${t_archive_method:=aq}
+: ${tagpfx:=archive/test-dummy}
 : ${suitespecs:=sid:unstable}
 
 t-git-next-date () {
@@ -190,6 +189,8 @@ t-git-merge-base () {
 }
 
 t-has-ancestor () {
+	# t-has-ancestor ANCESTOR
+	# (CHILD is implicit, HEAD)
 	local now=`git rev-parse HEAD`
 	local ancestor=`git rev-parse $1^{}`
 	local mbase=`t-git-merge-base $ancestor $now`
@@ -198,6 +199,18 @@ t-has-ancestor () {
 	fi
 }
 
+t-has-parent-or-is () {
+	# t-has-parent-or-is CHILD PARENT
+	local child=$1
+	local parent=$2
+	local parents=$(git show --pretty=format:' %P %H ' "$child")
+	parent=$(git rev-parse "$parent~0")
+	case "$parents" in
+	*" $parent "*)	;;
+	*)	fail "child $child lacks parent $parent" ;;
+	esac
+}
+
 t-prep-newpackage () {
 	t-select-package $1
 	v=$2
@@ -214,6 +227,9 @@ t-prep-newpackage () {
 
 t-archive-none () {
 	t-select-package $1
+	t-archive-none-$t_archive_method
+}
+t-archive-none-aq () {
 	mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main
 
 	: >$tmp/aq/suites
@@ -225,10 +241,10 @@ t-archive-none () {
 		local sname=${suitespec#*:}
 
 		>$tmp/aq/package.$suite.$p
-		t-archive-updated $suite $p
+		t-aq-archive-updated $suite $p
 
 		>$tmp/aq/package.new.$p
-		t-archive-updated new $p
+		t-aq-archive-updated new $p
 
 		ln -sf $suite $tmp/aq/dsc_in_suite/$sname
 
@@ -255,7 +271,7 @@ END
 END
 }
 
-t-archive-updated () {
+t-aq-archive-updated () {
 	local suite=$1
 	local p=$2
 	local suitedir=$tmp/aq/dsc_in_suite/$suite
@@ -280,16 +296,23 @@ t-archive-updated () {
 
 t-archive-process-incoming () {
 	local suite=$1
-	mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+	mv $tmp/incoming/${p}_* $tmp/mirror/pool/main/
 	t-archive-query "$suite"
 }
 
 t-archive-query () {
 	local suite=${1-sid}
 	local dscf=main/${p}_${v}.dsc
+	t-archive-query-$t_archive_method "$suite" "$p" "$v" "$dscf"
+}
+t-archive-query-aq () {
+	local suite=$1
+	local p=$2
+	local v=$3
+	local dscf=$4
 	local sha=`sha256sum <$tmp/mirror/pool/$dscf`
 	echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.$suite.${p}
-	t-archive-updated $suite $p
+	t-aq-archive-updated $suite $p
 }
 
 t-archive () {
@@ -298,7 +321,7 @@ t-archive () {
 	local dscf=${p}_$2.dsc
 	rm -f $tmp/mirror/pool/main/${p}_*
 	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
-	t-archive-query
+	t-archive-query $suite
 	rm -rf $tmp/extract
 	mkdir $tmp/extract
 	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
@@ -381,7 +404,8 @@ t-setup-done () {
 	local savedirs=$2
 	local importeval=$3
 
-	exec 4>$tmp/IMPORT.new
+	local import=IMPORT.${0##*/}
+	exec 4>$tmp/$import.new
 
 	local vn
 	for vn in $savevars; do
@@ -390,11 +414,11 @@ t-setup-done () {
 		' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
 	done
 
-	(set -e; cd $tmp; tar cf IMPORT.tar $savedirs)
+	(set -e; cd $tmp; tar cf $import.tar $savedirs)
 
 	printf >&4 "\n%s\n" "$importeval"
 
-	mv -f $tmp/IMPORT.new $tmp/IMPORT
+	mv -f $tmp/$import.new $tmp/$import
 }
 
 t-setup-import () {
@@ -412,7 +436,7 @@ t-setup-import () {
 		lock="$setupsrc.lock"
 	fi
 
-	local simport="$setupsrc/IMPORT"
+	local simport="$setupsrc/IMPORT.$setupname"
 
 	if ! [ -e "$simport" ]; then
 		with-lock-ex -w "$lock" \
@@ -476,17 +500,19 @@ t-ref-head () {
 t-ref-same-val () {
 	local name="$1"
 	local val=$2
-	case "$t_ref_val" in
-	'')		;;
+	case "${t_ref_val-unset}" in
+	unset)		;;
 	"$val")		;;
-	*)		fail "ref varies: $name:\
- ${val:-nothing} != ${t_ref_val:-nothing}" ;;
+	*)		fail "ref varies: ($name)\
+ ${val:-nothing} != ${t_ref_val:-nothing} (${t_ref_names[*]})" ;;
 	esac
 	t_ref_val="$val"
+	t_ref_names+=("$name")
 }
 
 t-refs-same-start () {
-	t_ref_val=''
+	unset t_ref_val
+	t_ref_names=()
 }
 
 t-refs-same () {
@@ -574,6 +600,7 @@ t-splitbrain-pushed-good--unpack () {
 	mkdir t-unpack
 	cd t-unpack
 	ln -s $tmp/mirror/pool/main/*.orig*.tar* .
+	ln -s $tmp/incoming/*.orig*.tar* . ||:
 	ln -s $incoming_dsc .
 	ln -s ${incoming_dsc/.dsc/.debian.tar}* .
 	dpkg-source "$@" -x *.dsc
@@ -603,6 +630,13 @@ t-splitbrain-pushed-good-start () {
 	git merge-base --is-ancestor $dep14tag $dgittag
 
 	t-refs-same-start
+	t-ref-same refs/heads/split.p
+	case "$(t-git-get-ref refs/heads/split.b)" in
+	"$t_ref_val") ;;
+	"$(git rev-parse refs/heads/split.p^0)") ;;
+	"$(git rev-parse refs/heads/split.p^1)") ;;
+	*) fail 'bad b/p' ;;
+	esac
 	t-pushed-good-core
 
 	t-incoming-dsc
@@ -811,7 +845,7 @@ t-gbp-example-prep () {
 t-commit () {
 	local msg=$1
 	v=${2:-${majorv:-1}.$revision}
-	dch -v$v --distribution ${3:-unstable} "$1"
+	dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
 	git add debian/changelog
 	debcommit
 	revision=$(( ${revision-0} + 1 ))
@@ -826,7 +860,7 @@ t-drs () {
  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
- t-git-config dgit-distro.test-dummy.dgit-tag-format old,new
+ t-git-config dgit-distro.test-dummy.dgit-tag-format new,old,maint
 	cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
 	cp $troot/suites $tmp/.
 	cp $troot/suites $tmp/suites-master
@@ -853,6 +887,7 @@ t-newtag () {
  t-git-config dgit-distro.test-dummy.dgit-tag-format new,maint
 }
 t-oldtag () {
+ export tagpfx=test-dummy
  t-git-config dgit-distro.test-dummy.dgit-tag-format old
 }
 
@@ -924,6 +959,7 @@ t-chain-test () {
 	local d=${0%/*}
 	cd $root
 	export DGIT_TEST_TESTNAME="$testname"
+	export DGIT_TEST_TMPBASE="$tmpbase"
 	export ADTTMP=$tmp
 	exec "$d/$ct"
 }	
@@ -933,3 +969,8 @@ t-alt-test () {
 	t-${t%%-*}
 	t-chain-test "${t#*-}"
 }
+
+case "$0" in
+*/gnupg) ;;
+*)	t-setup-import gnupg	;;
+esac