X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=38605bd9359e2f9200b1d4737ef3f235f60887e7;hb=caf1d5b8fead2e9fc25b9a7a2dc86a10671f65ef;hp=1179fb093f8ed48535c60a5eaaf52fc7ae9de481;hpb=1647f63f87eb287027d685d22c6a798aa775ebd1;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 1179fb09..38605bd9 100644
--- a/tests/lib
+++ b/tests/lib
@@ -5,12 +5,30 @@ set -x
 set -o pipefail
 
 . tests/lib-core
+. tests/lib-restricts
+
+t-report-failure () {
+	set +x
+	rc=$1
+	cat <<END >&2
+TEST FAILED
+funcs: ${FUNCNAME[*]}
+lines: ${BASH_LINENO[*]}
+files: ${BASH_SOURCE[*]}
+END
+	exit 16
+}
+
+trap 'test $? = 0 || t-report-failure' EXIT
 
 t-set-intree
 
-: ${DGIT_TEST_DEBUG:=-D}
+: ${DGIT_TEST_DEBUG=-D}
 export DGIT_TEST_DEBUG
 
+export GIT_COMMITTER_DATE='1440253867 +0100'
+export GIT_AUTHOR_DATE='1440253867 +0100'
+
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
@@ -44,6 +62,13 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
+: ${tagpfx:=test-dummy}
+
+t-git-next-date () {
+	GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
+	GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
+}
+
 t-expect-fail () {
 	local mpat="$1"; shift
 
@@ -125,7 +150,7 @@ t-untar () {
 	local tarfile=$1.tar
 	local edittree=$1.edit
 	if test -d "$edittree"; then
-		cp -al "$edittree"/* .
+		cp -a "$edittree"/* .
 	else
 		tar xf "$tarfile"
 	fi
@@ -376,7 +401,8 @@ t-ref-same-val () {
 	case "$t_ref_val" in
 	'')		;;
 	"$val")		;;
-	*)		fail "ref varies: $name: $val != $t_ref_val" ;;
+	*)		fail "ref varies: $name:\
+ ${val:-nothing} != ${t_ref_val:-nothing}" ;;
 	esac
 	t_ref_val="$val"
 }
@@ -403,7 +429,7 @@ t-refs-notexist () {
 }
 
 t-v-tag () {
-	echo refs/tags/test-dummy/${v//\~/_}
+	echo refs/tags/$tagpfx/${v//\~/_}
 }
 
 t-check-pushed-master () {
@@ -503,6 +529,52 @@ t-apply-diff () {
 	 | patch -p1 -u
 }
 
+t-gbp-unapplied-pq2qc () {
+	# does `gbp pq export'
+	# commits the resulting debian/patches on  qc/BRANCH
+	# leaves us on qc/BRANCH (eg "qc/quilt-tip"))
+	# qc/BRANCH is not fast-forwarding
+
+	gbp pq export
+
+	branch=`git symbolic-ref HEAD`
+	branch=${branch#refs/heads/}
+
+	case "$branch" in
+	*/*) fail "unexpected branch $branch" ;;
+	esac
+
+	git branch -f qc/$branch
+	git checkout qc/$branch
+	git add debian/patches
+	git commit -m 'Commit patch queue'
+}
+
+t-gbp-example-prep () {
+	t-archive example 1.0-1
+	t-git-none
+	t-worktree 1.0
+
+	cd example
+
+	t-dgit fetch
+
+	git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+	gbp pq rebase
+
+	echo '/* some comment */' >>src.c
+	git add src.c
+	git commit -m 'Add a comment to an upstream file'
+
+	t-gbp-unapplied-pq2qc
+
+	t-commit 'some updates' 1.0-2
+
+	git merge -s ours \
+		-m 'Pseudo-merge to make descendant of archive' \
+		remotes/dgit/dgit/sid
+}
+
 t-commit () {
 	local msg=$1
 	v=${2-1.$revision}
@@ -542,6 +614,14 @@ t-drs () {
 	ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
+t-newtag () {
+ export tagpfx=archive/test-dummy
+ t-git-config dgit-distro.test-dummy.dgit-tag-format new
+}
+t-oldtag () {
+ t-git-config dgit-distro.test-dummy.dgit-tag-format old
+}
+
 t-dsd () {
 	t-drs
  t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"
@@ -567,14 +647,20 @@ t-policy-nonexist () {
 	ln -sf no-such-file-or-directory $drs_dispatch/policy-hook
 }
 
-t-policy () {
-	local policyhook=$1
-	policyhook=${DGIT_INFRA_PFX}$policyhook
-	case $policyhook in
+t-make-hook-link () {
+	local hook=$1 # in infra/
+	local linkpath=$2
+	hook=${DGIT_INFRA_PFX}$hook
+	case $hook in
 	*/*) 	;;
-	*)	policyhook=`type -P $policyhook` ;;
+	*)	hook=`type -P $hook` ;;
 	esac
-	ln -sf "$policyhook" $drs_dispatch/policy-hook
+	ln -sf "$hook" $linkpath
+}
+
+t-policy () {
+	local policyhook=$1
+	t-make-hook-link $policyhook $drs_dispatch/policy-hook
 }
 
 t-debpolicy () {
@@ -590,6 +676,15 @@ t-policy-periodic () {
 		test-dummy $drs_dispatch '' --cron
 }
 
+t-restrict () {
+	local restriction=$1
+	(cd $root; t-restriction-$restriction >&2)
+}
+
+t-dependencies () {
+	: "Hopefully installed: $*"
+}
+
 t-chain-test () {
 	local ct=$1
 	local d=${0%/*}