X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=a050522890c49fe8bed8076c7584a7ac2dfcc314;hp=6028133a21b38bd6518e0bc7bad1471581ca25be;hb=2a2b0931f9b29bf372136451d317eb81649424e2;hpb=e7f59af8133f6e80a4a18b171664af8517555360

diff --git a/tests/lib b/tests/lib
index 6028133a..a0505228 100644
--- a/tests/lib
+++ b/tests/lib
@@ -33,8 +33,8 @@ export DGIT_TEST_DEBUG
 
 : ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
 
-export GIT_COMMITTER_DATE='1515000000 +0100'
-export GIT_AUTHOR_DATE='1515000000 +0100'
+export GIT_COMMITTER_DATE='1530000000 +0100'
+export GIT_AUTHOR_DATE='1530000000 +0100'
 
 root=`pwd`
 troot=$root/tests
@@ -62,10 +62,11 @@ t-set-using-tmp
 test -f $tmp/.save-env || \
 env -0 >$tmp/.save-env
 
-ln -f $troot/ssh ssh
+ln -sf $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
 unset VISUAL
+unset GIT_EDITOR
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
@@ -91,7 +92,9 @@ t-expect-fail () {
 	local mpat="$1"; shift
 
 	set +o pipefail
-	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+	LC_MESSAGES=${expect_fail_lcmessages-C} \
+	LANGUAGE=${expect_fail_lcmessages-C} \
+	"$@" 2>&1 | tee $tmp/t.output
 	local ps="${PIPESTATUS[*]}"
 	set -o pipefail
 
@@ -341,7 +344,7 @@ t-archive () {
 	v=$2
 	local dscf=${p}_$2.dsc
 	rm -f $tmp/mirror/pool/main/${p}_*
-	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
+	ln -s $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
 	t-archive-query $suite
 	rm -rf $tmp/extract
 	mkdir $tmp/extract
@@ -403,6 +406,13 @@ t-git-fsck () {
 	esac
 }
 
+t-check-only-bpd () {
+	if [ "$bpd" = .. ]; then return; fi
+	t-files-notexist \
+		$tmp/*.{deb,changes,dsc,buildinfo} \
+		$tmp/*.{tar,diff}.*
+}
+
 t-fscks () {
 	(
 	shopt -s nullglob
@@ -415,6 +425,7 @@ t-fscks () {
 
 t-ok () {
 	: '========================================'
+	t-check-only-bpd
 	t-fscks
 	t-save-artifacts
 	echo ok.
@@ -1025,10 +1036,32 @@ t-make-badcommit () {
 	t-expect-fsck-fail $badcommit
 }
 
+t-make-orig () {
+	# leaves ust set to filename of orig tarball
+	local p=$1
+	local v=$2
+	local tag=${3-v$2}
+	ust=${p}_${v}.orig.tar.gz
+	GZIP=-1 git archive -o $bpd/$ust --prefix=${p}-${v}/ $tag
+}
+
+t-merge-conflicted-stripping-conflict-markers () {
+	local otherbranch=$1
+	local file=$2
+
+	t-expect-fail F:"Merge conflict in $file" \
+	git merge $otherbranch
+
+	perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' "$file"
+	git add "$file"
+	git commit --no-edit
+}
+
 t-commit () {
 	local msg=$1
 	v=${2:-${majorv:-1}.$revision}
-	dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
+	$troot/tstunt/debchange \
+		--force-distribution -v$v --distribution ${3:-unstable} "$1"
 	git add debian/changelog
 	debcommit
 	revision=$(( ${revision-0} + 1 ))
@@ -1045,7 +1078,7 @@ t-dch-commit-r () {
 }
 
 t-dch-commit () {
-	faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
+	$troot/tstunt/debchange "$@"
 	git commit -m "dch $*" debian/changelog
 }