X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib;h=9fc056e6d12455f321e53cc610f1b3aef54fed02;hb=2522d3ba9ca4b00bffc107342f471fabac0a04b9;hp=e710f39dc660f8d1d065a3c46c08d5fb93449f19;hpb=27372f8aae862754654b46cf719f759cea99eb9d;p=dgit.git

diff --git a/tests/lib b/tests/lib
index e710f39d..9fc056e6 100644
--- a/tests/lib
+++ b/tests/lib
@@ -141,10 +141,14 @@ 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
@@ -270,6 +274,7 @@ t-rm-dput-dropping () {
 
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
+	pwd
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
@@ -326,6 +331,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`
@@ -362,7 +373,7 @@ t-refs-same () {
 t-refs-notexist () {
 	local val
 	for g in $*; do
-		val=`t-git-get-ref $g >$tmp/t.refx`
+		val=`t-git-get-ref $g`
 		if [ "x$val" != x ]; then
 			fail "ref $g unexpectedly exists ($val)"
 		fi
@@ -370,7 +381,16 @@ t-refs-notexist () {
 }
 
 t-v-tag () {
-	echo refs/tags/debian/${v//\~/_}
+	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 () {
@@ -387,6 +407,7 @@ t-pushed-good () {
 	 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
 	)
@@ -461,11 +482,11 @@ t-apply-diff () {
 
 t-commit () {
 	local msg=$1
-	v=1.$revision
+	v=${2-1.$revision}
 	dch -v$v --distribution unstable "$1"
 	git add debian/changelog
 	debcommit
-	revision=$(( $revision + 1 ))
+	revision=$(( ${revision-0} + 1 ))
 }
 
 t-git-config () {
@@ -479,6 +500,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
@@ -488,7 +512,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