X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=376585ca9cc02205a35f0dd39d1c8fd56577017d;hb=d65bf48c36157b7197c6fabfdb3ee64b7e147682;hp=2842ce8b6ea7d5e24b680be47835f1f22a734aff;hpb=0e2be4b852820edac3d2389b144661bf2f12c8ab;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 2842ce8b..376585ca 100644
--- a/tests/lib
+++ b/tests/lib
@@ -66,6 +66,7 @@ ln -f $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
 unset VISUAL
+unset GIT_EDITOR
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
@@ -675,6 +676,12 @@ t-push-was-source-only () {
         done
 }
 
+t-push-included () {
+    for f in $@; do
+        stat $tmp/incoming/$f
+    done
+}
+
 t-pushed-good () {
 	local branch=$1
 	local suite=${2:-sid}
@@ -702,6 +709,12 @@ t-pushed-good-core () {
 	git verify-tag `t-v-tag`
 }
 
+t-pushed-good-check-changes () {
+	changes_filename="$tmp/incoming/${p}_${v}_*.changes"
+        grep -E "^Distribution: $suite" $changes_filename
+        grep -E "^Version: $v" $changes_filename
+}
+
 t-splitbrain-pushed-good--unpack () {
 	cd $tmp
 	rm -rf t-unpack
@@ -1013,10 +1026,23 @@ t-make-badcommit () {
 	t-expect-fsck-fail $badcommit
 }
 
+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 ))
@@ -1033,7 +1059,7 @@ t-dch-commit-r () {
 }
 
 t-dch-commit () {
-	faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
+	$troot/tstunt/debchange "$@"
 	git commit -m "dch $*" debian/changelog
 }
 
@@ -1138,6 +1164,10 @@ t-buildproductsdir-config () {
 	bpd=$tmp/bpd
 	t-git-config dgit.default.build-products-dir $bpd
 	mkdir -p $bpd
+	cat <<END >>$tmp/.gbp.conf
+[buildpackage]
+export-dir = $bpd
+END
 }
 
 t-restrict () {