X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=bd06d20d21cc7364ce1e056777e5fd03e35b4b29;hp=7c52788274ba7fd04edee2024bab3b86d1d20bc6;hb=9f4a5f045e36edddb3ffd23667a52f4ee319c675;hpb=fb632e4f36ad204600c88406acd5d252c81d8bf1

diff --git a/tests/lib b/tests/lib
index 7c527882..bd06d20d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -12,6 +12,7 @@ t-report-failure () {
 	rc=$1
 	cat <<END >&2
 TEST FAILED
+cwd: $PWD
 funcs: ${FUNCNAME[*]}
 lines: ${BASH_LINENO[*]}
 files: ${BASH_SOURCE[*]}
@@ -21,17 +22,22 @@ END
 
 trap 'test $? = 0 || t-report-failure' EXIT
 
+t-filter-out-git-hyphen-dir
+
 t-set-intree
 
 : ${DGIT_TEST_DEBUG=-D}
 export DGIT_TEST_DEBUG
 
-export GIT_COMMITTER_DATE='1440253867 +0100'
-export GIT_AUTHOR_DATE='1440253867 +0100'
+: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
+
+export GIT_COMMITTER_DATE='1515000000 +0100'
+export GIT_AUTHOR_DATE='1515000000 +0100'
 
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
+export DGIT_TEST_TROOT=$troot
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -40,6 +46,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
 
@@ -47,14 +55,11 @@ tmp=`pwd`
 
 t-set-using-tmp
 
+test -f $tmp/.save-env || \
 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
@@ -65,7 +70,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 () {
@@ -113,7 +119,7 @@ t-grep-mpat () {
 t-expect-push-fail () {
 	local mpat="$1"; shift
 
-	local triedpush=`git rev-parse HEAD`
+	local triedpush; triedpush=`git rev-parse HEAD`
 
 	t-reporefs pre-push
 	t-expect-fail "$mpat"  "$@"
@@ -183,19 +189,41 @@ t-git-none () {
 	(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
 }
 
+t-salsa-add-remote () {
+	local d=$tmp/salsa/$p
+	mkdir -p $d
+	(set -e; cd $d; git init --bare)
+	git remote add ${1-origin} $d
+}
+
 t-git-merge-base () {
 	git merge-base $1 $2 || test $? = 1
 }
 
 t-has-ancestor () {
-	local now=`git rev-parse HEAD`
-	local ancestor=`git rev-parse $1^{}`
-	local mbase=`t-git-merge-base $ancestor $now`
+	# t-has-ancestor ANCESTOR
+	# (CHILD is implicit, HEAD)
+	local now;      now=`git rev-parse HEAD`
+	local ancestor; ancestor=`git rev-parse $1^{}`
+	local mbase;    mbase=`t-git-merge-base $ancestor $now`
 	if [ x$mbase != x$ancestor ]; then
 		fail "not ff $ancestor..$now, $mbase != $ancestor"
 	fi
 }
 
+t-has-parent-or-is () {
+	# t-has-parent-or-is CHILD PARENT
+	local child=$1
+	local parent=$2
+	local parents
+	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
@@ -212,6 +240,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
@@ -223,12 +254,12 @@ 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 -s $suite $tmp/aq/dsc_in_suite/$sname
+		ln -sf $suite $tmp/aq/dsc_in_suite/$sname
 
 		cat <<END >>$tmp/aq/suites
 $jsondelim
@@ -253,7 +284,7 @@ END
 END
 }
 
-t-archive-updated () {
+t-aq-archive-updated () {
 	local suite=$1
 	local p=$2
 	local suitedir=$tmp/aq/dsc_in_suite/$suite
@@ -278,16 +309,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
-	local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+	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; 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 () {
@@ -296,7 +334,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)
@@ -324,22 +362,85 @@ t-git-dir-check () {
 	esac
 }
 
+t-expect-fsck-fail () {
+	echo >>$tmp/fsck.expected-errors "$1"
+}
+
+t-git-fsck () {
+	local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs
+
+	set +e
+	LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
+		| tee $fsckerrs
+	ps="${PIPESTATUS[*]}"
+	set -e
+
+	local pats
+	if [ -f $tmp/fsck.expected-errors ]; then
+		pats=(-w -f $tmp/fsck.expected-errors)
+	else
+		test "$ps" = "0 0"
+	fi
+	pats+=(-e 'notice: HEAD points to an unborn branch')
+	pats+=(-e 'notice: No default references')
+
+	set +e
+	grep -v "${pats[@]}" $fsckerrs
+	rc=$?
+	set -e
+	case $rc in
+	1) ;; # no unexpected errors
+	0) fail "unexpected messages from git-fsck" ;;
+	*) fail "grep of git-fsck failed" ;;
+	esac
+}
+
+t-fscks () {
+	(
+	shopt -s nullglob
+	for d in $tmp/*/.git $tmp/git/*.git; do
+		cd "${d%/.git}"
+		t-git-fsck
+	done
+	)
+}
+
+t-ok () {
+	: '========================================'
+	t-fscks
+	echo ok.
+}
+
 t-rm-dput-dropping () {
 	rm -f $tmp/${p}_${v}_*.upload
 }
 
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
-	pwd
+	pwd >&2
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
-		-k39B13D8A $t_dgit_xopts "$@"
+ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+ ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \
+		${distro+${distro:+-d}}${distro--dtest-dummy} \
+		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+		-kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
 
+t-dgit-manpage () {
+	local section=$1
+	local page=$2
+	(export LC_ALL=C.UTF-8
+	 if [ "$DGIT_TEST_INTREE" ]; then
+		make -C $DGIT_TEST_INTREE $page.$section.view
+	 else
+		man $section $page
+	 fi)
+}
+
 t-diff-nogit () {
 	diff --exclude=.git --exclude=.pc -ruN $*
 }
@@ -379,20 +480,21 @@ t-setup-done () {
 	local savedirs=$2
 	local importeval=$3
 
-	exec 4>$tmp/IMPORT.new
+	local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}}
+	exec 4>$tmp/$import.new
 
 	local vn
 	for vn in $savevars; do
-		perl >&4 -I. -MDebian::Dgit -e '
+		perl >&4 -"I$root" -MDebian::Dgit -e '
 			printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
 		' $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 () {
@@ -410,7 +512,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" \
@@ -456,35 +558,37 @@ t-git-get-ref () {
 
 t-ref-same-exact () {
 	local name="$1"
-	local val=`t-git-get-ref-exact $name`
+	local val; val=`t-git-get-ref-exact $name`
 	t-ref-same-val "$name" $val
 }
 
 t-ref-same () {
 	local name="$1"
-	local val=`t-git-get-ref $name`
+	local val; val=`t-git-get-ref $name`
 	t-ref-same-val "$name" $val
 }
 
 t-ref-head () {
-	local val=`git rev-parse HEAD`
+	local val; 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
-	'')		;;
+	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 () {
@@ -515,11 +619,11 @@ t-format-ref () {
 t-sametree-parent () {
 	local ref=$1
 	local parent
-	local ctree=$(t-format-ref '%T' "$ref")
+	local ctree; ctree=$(t-format-ref '%T' "$ref")
 	while :; do
 		local psame=''
 		for parent in $(t-format-ref '%P' "$ref"); do
-			local ptree=$(t-format-ref '%T' "$parent")
+			local ptree; ptree=$(t-format-ref '%T' "$parent")
 			if [ "x$ptree" = "x$ctree" ]; then
 				psame+=" $parent"
 			fi
@@ -531,14 +635,29 @@ t-sametree-parent () {
 }
 
 t-check-pushed-master () {
-	local master=`t-git-get-ref refs/heads/master`
+	local master; master=`t-git-get-ref refs/heads/master`
 	if [ x$master = x$t_ref_val ]; then return; fi
 	if [ x$master = x ]; then fail "failed to push master"; fi
 	# didn't update master, it must be not FF
-	local mbase=`t-git-merge-base $master $t_ref_val`
+	local mbase; mbase=`t-git-merge-base $master $t_ref_val`
 	if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
 }
 
+t-push-was-source-only () {
+        local f
+	t-files-notexist $tmp/incoming/${p}_${v}_*.deb \
+                         $tmp/incoming/${p}_${v}_*.udeb
+	# we permit _source.buildinfo files; see test_changes_source_only()
+	for f in $tmp/incoming/${p}_${v}_*.buildinfo; do
+            if [ -e $f ]; then
+                case "$f" in
+                    *_source.buildinfo) ;;
+                    *) fail "non-source-only file $f exists!" ;;
+                esac
+            fi
+        done
+}
+
 t-pushed-good () {
 	local branch=$1
 	local suite=${2:-sid}
@@ -572,6 +691,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
@@ -601,6 +721,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
@@ -656,6 +783,19 @@ t-gbp-pushed-good () {
 	t-splitbrain-pushed-good-end-made-dep14
 }
 
+t-unapplied-pushed-good () {
+	t-splitbrain-pushed-good-start
+	t-splitbrain-pushed-good--unpack --skip-patches
+	t-splitbrain-pushed-good-end-made-dep14
+}
+
+t-dpm-pushed-good () {
+	t-splitbrain-pushed-good-start
+	t-splitbrain-pushed-good--unpack
+	t-splitbrain-rm-gitignore-patch
+	t-splitbrain-pushed-good-end-made-dep14
+}
+
 t-commit-build-push-expect-log () {
 	local msg=$1
 	local mpat=$2
@@ -679,24 +819,68 @@ t-822-field () {
 	' <$file
 }
 
+t-defdistro () {
+	export DGIT_TEST_DISTRO=''
+	distro=''
+	t-git-config dgit-suite.unstable.distro test-dummy
+}
+
 t-stunt-envvar () {
 	local var=$1
 	local tstunt=$2
 	eval '
-		case "'$var'" in
+		case "$'$var'" in
 		"$tstunt:"*)	;;
 		*":$tstunt:"*)	;;
+		"")		'$var'="$tstunt" ;;
 		*)		'$var'="$tstunt:$'$var'" ;;
 		esac
+		export '$var'
 	'
 }
 
+t-tstunt--save-real () {
+	local f="$1"
+	case "$f" in
+	*/*) return ;;
+	esac
+
+	local rc
+	local real
+	set +e
+	real=$(
+		p=":$PATH:"
+		p="${p/:"$tmp/tstunt":/:}"
+		p="${p%:}"
+		p="${p#:}"
+		PATH="$p"
+		type -p "$f"
+	)
+	rc=$?
+	set -e
+
+	case $rc in
+	1)	return ;;
+	0)	;;
+	*)	fail "did not find $f on PATH $PATH" ;;
+	esac
+
+	local varname=${f//[^_0-9a-zA-Z]/_}
+	varname=DGIT_TEST_REAL_${varname^^}
+
+	eval "
+		: \${$varname:=\$real}
+		export $varname
+	"
+}
+
 t-tstunt () {
 	local tstunt=$tmp/tstunt
 	t-stunt-envvar PATH $tstunt
 	t-stunt-envvar PERLLIB $tstunt
 	local f
 	for f in "$@"; do
+		t-tstunt--save-real $f
 		f="./$f"
 		local d="$tstunt/${f%/*}"
 		mkdir -p $d
@@ -708,6 +892,14 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
+t-tstunt-lintian () {
+	t-tstunt lintian
+}
+
+t-tstunt-debuild () {
+	t-tstunt debuild
+}
+
 t-incoming-dsc () {
 	local dsc=${p}_${v}.dsc
 	incoming_dsc=$tmp/incoming/$dsc
@@ -715,8 +907,12 @@ t-incoming-dsc () {
 
 t-ref-dsc-dgit () {
 	t-incoming-dsc
-	local val=`t-822-field $incoming_dsc Dgit`
-	perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+	local val; val=`t-822-field $incoming_dsc Dgit`
+	val=$( perl -e '
+		$_=shift @ARGV;
+		die "Dgit $_ ?" unless m/^\w+\b/;
+		print $&,"\n" or die $!;
+	' "$val")
 	t-ref-same-val $incoming_dsc "$val"
 }
 
@@ -749,7 +945,19 @@ t-gbp-unapplied-pq2qc () {
 	git commit -m 'Commit patch queue'
 }
 
-t-gbp-example-prep () {
+t-git-pseudo-merge () {
+	# like   git merge -s ours
+	if [ ! "$git_pseuomerge_opts" ]; then
+		if git merge --help \
+		 | grep -q allow-unrelated-histories; then
+			git_pseuomerge_opts='--allow-unrelated-histories'
+		fi
+		git_pseuomerge_opts+=' -s ours'
+	fi
+	git merge $git_pseuomerge_opts "$@"
+}
+
+t-gbp-example-prep-no-ff () {
 	t-tstunt-parsechangelog
 	t-archive example 1.0-1
 	t-git-none
@@ -759,7 +967,7 @@ t-gbp-example-prep () {
 
 	t-dgit fetch
 
-	git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+	git checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
 	gbp pq rebase
 
 	echo '/* some comment */' >>src.c
@@ -769,31 +977,48 @@ t-gbp-example-prep () {
 	t-gbp-unapplied-pq2qc
 
 	t-commit 'some updates' 1.0-2
+}
 
-	git merge -s ours \
+t-gbp-example-prep () {
+	t-gbp-example-prep-no-ff
+
+	t-git-pseudo-merge \
 		-m 'Pseudo-merge to make descendant of archive' \
 		remotes/dgit/dgit/sid
 }
 
+t-make-badcommit () {
+	badcommit=$(
+		git cat-file commit HEAD | \
+		perl -pe 's/^committer /commiter /' | \
+		git hash-object -w -t commit --stdin
+	)
+	t-expect-fsck-fail $badcommit
+}
+
 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 ))
 }
 
+t-dch-commit () {
+	faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
+	git commit -m "dch $*" debian/changelog
+}
+
 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
- 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
@@ -817,9 +1042,10 @@ t-drs () {
 
 t-newtag () {
  export tagpfx=archive/test-dummy
- t-git-config dgit-distro.test-dummy.dgit-tag-format new
+ 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
 }
 
@@ -841,7 +1067,9 @@ t-dsd () {
 }
 
 t-policy-admin () {
+	: '(((((((((((((((((((((((((((((((((((((((('
 	${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
+	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
 t-policy-nonexist () {
@@ -873,8 +1101,10 @@ t-debpolicy () {
 }
 
 t-policy-periodic () {
+	: '(((((((((((((((((((((((((((((((((((((((('
 	${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
 		test-dummy $drs_dispatch '' --cron
+	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
 t-restrict () {
@@ -891,6 +1121,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"
 }	
@@ -900,3 +1131,10 @@ t-alt-test () {
 	t-${t%%-*}
 	t-chain-test "${t#*-}"
 }
+
+t-git-config dgit.default.old-dsc-distro test-dummy
+
+case "$0" in
+*/gnupg) ;;
+*)	t-setup-import gnupg	;;
+esac