X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=118c497115e9f1ac96198a6c7b392653215cc394;hp=699ec6cf8c11109ea35673efcc80662c86a35224;hb=5ecff56dbf1b60b6b5c814b3450bf4ec37ed26d6;hpb=b6e8a1eb90f89a9f6fd4da8addcd168dc1e0e3e0

diff --git a/tests/lib b/tests/lib
index 699ec6cf..118c4971 100644
--- a/tests/lib
+++ b/tests/lib
@@ -47,6 +47,24 @@ END
 t-expect-fail () {
 	local mpat="$1"; shift
 
+	set +o pipefail
+	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+	local ps="${PIPESTATUS[*]}"
+	set -o pipefail
+
+	case $ps in
+	"0 0")	fail "command unexpectedly succeeded (instead of: $mpat)" ;;
+	*" 0")	;;
+	*)	fail "tee failed"  ;;
+	esac
+
+	t-grep-mpat "$mpat" $tmp/t.output
+}
+
+t-grep-mpat () {
+	local mpat="$1"
+	local file="$2"
+
 	local grepper=fgrep
 	case "$mpat" in
 	[A-Z]:*)
@@ -59,19 +77,8 @@ t-expect-fail () {
 		;;
 	esac
 
-	set +o pipefail
-	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
-	local ps="${PIPESTATUS[*]}"
-	set -o pipefail
-
-	case $ps in
-	"0 0")	fail "command unexpectedly succeeded (instead of: $mpat)" ;;
-	*" 0")	;;
-	*)	fail "tee failed"  ;;
-	esac
-
-	$grepper -e "$mpat" $tmp/t.output ||
-		fail "error message not found"
+	$grepper -e "$mpat" "$file" ||
+		fail "message not found"
 }
 
 t-expect-push-fail () {
@@ -92,7 +99,7 @@ t-expect-push-fail () {
 t-git-objects-not-present () {
 	# t-git-objects-not-present GITDIR|'' OBJID [...]
 	# specifying '' means the repo for package $p
-	local gitdir="${1-$tmp/git/$p.git}"
+	local gitdir="${1-$dgitrepo}"
 	local obj
 	if ! [ -e "$gitdir" ]; then return; fi
 	for obj in "$@"; do
@@ -107,8 +114,8 @@ t-reporefs () {
 	local outputfile="$tmp/show-refs.$whichoutput"
 	(set -e
 	 exec >"$outputfile"
-	 if test -d $tmp/git/$p.git; then
-		cd $tmp/git/$p.git
+	 if test -d $dgitrepo; then
+		cd $dgitrepo
 		git show-ref |sort
 	fi)
 }
@@ -128,8 +135,13 @@ t-worktree () {
 	t-untar $troot/worktrees/${p}_$1
 }
 
-t-git () {
+t-select-package () {
 	p=$1
+	dgitrepo=$tmp/git/$p.git
+}
+
+t-git () {
+	t-select-package $1
 	v=$2
 	mkdir -p $tmp/git
 	local gs=$troot/git-srcs/${p}_$v.git
@@ -141,17 +153,21 @@ t-git-none () {
 	(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
 }
 
+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=`git merge-base $ancestor $now`
+	local mbase=`t-git-merge-base $ancestor $now`
 	if [ x$mbase != x$ancestor ]; then
 		fail "not ff $ancestor..$now, $mbase != $ancestor"
 	fi
 }
 
 t-prep-newpackage () {
-	p=$1
+	t-select-package $1
 	v=$2
 	t-archive-none $p
 	t-git-none
@@ -165,7 +181,7 @@ t-prep-newpackage () {
 }
 
 t-archive-none () {
-	p=$1
+	t-select-package $1
 	mkdir -p $tmp/aq $tmp/mirror/pool/main
 
 	local suite=sid
@@ -243,11 +259,11 @@ t-archive () {
 }
 
 t-git-dir-time-passes () {
-	touch -d 'last year' $tmp/git/$p.git
+	touch -d 'last year' $dgitrepo
 }
 
 t-git-dir-check () {
-	local gitdir=$tmp/git/$p.git
+	local gitdir=$dgitrepo
 	case "$1" in
 	enoent)
 		if test -e "$gitdir"; then fail "$gitdir exists"; fi
@@ -327,6 +343,12 @@ t-git-get-ref () {
 	'
 }
 
+t-ref-same-exact () {
+	local name="$1"
+	local 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`
@@ -374,6 +396,15 @@ t-v-tag () {
 	echo refs/tags/test-dummy/${v//\~/_}
 }
 
+t-check-pushed-master () {
+	local 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`
+	if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
+}
+
 t-pushed-good () {
 	local branch=$1
 	t-ref-dsc-dgit
@@ -384,10 +415,11 @@ t-pushed-good () {
 	t-refs-notexist \
 		refs/heads/dgit/unstable \
 		refs/remotes/dgit/dgit/unstable
-	(set -e; cd $tmp/git/$p.git
+	(set -e; cd $dgitrepo
 	 t-refs-same \
 		refs/dgit/sid \
 		`t-v-tag`
+	 ${t_check_pushed_master:- : NOT-DRS-NO-CHECK-PUSHED-MASTER}
 	 t-refs-notexist \
 		refs/dgit/unstable
 	)
@@ -436,15 +468,6 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
-t-prep-mergechangelogs () {
-	local b=merge.dpkg-mergechangelogs
-	git config $b.name 'debian/changelog merge driver'
-	git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
-	mkdir -p .git/info
-	echo >>.git/info/attributes \
-		'debian/changelog merge=dpkg-mergechangelogs'
-}
-
 t-ref-dsc-dgit () {
 	local dsc=${p}_${v}.dsc
 	local val=`t-822-field $tmp/incoming/$dsc Dgit`
@@ -480,6 +503,9 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-create true
 	cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
 	cp $troot/suites $tmp/.
+	cp $troot/suites $tmp/suites-master
+
+	export t_check_pushed_master=t-check-pushed-master
 
 	drs_dispatch=$tmp/distro=test-dummy
 	mkdir $drs_dispatch
@@ -489,7 +515,7 @@ t-drs () {
 	fi
 
 	ln -sf $tmp/git $drs_dispatch/repos
-	ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
+	ln -sf $tmp/suites $tmp/suites-master $tmp/dm.txt $drs_dispatch/
 	mkdir -p $drs_dispatch/keyrings
 	ln -sf $tmp/dd.gpg $drs_dispatch/keyrings/debian-keyring.gpg
 	ln -sf $tmp/dm.gpg $drs_dispatch/keyrings/debian-maintainers.gpg