test suite: dch: Always use tstunt/debchange

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 68bf9d7353726fe18a393dbbd7b10cee8b81d8b7..376585ca9cc02205a35f0dd39d1c8fd56577017d 100644 (file)
--- 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
@@ -708,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
@@ -1019,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 ))
@@ -1039,7 +1059,7 @@ t-dch-commit-r () {
 }
 
 t-dch-commit () {
-       faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
+       $troot/tstunt/debchange "$@"
        git commit -m "dch $*" debian/changelog
 }