git-debpush: Check that patches are (un)applicable

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index b2775c96e216c7f3b56576e22c46b23efd2808ad..78ec9a712153d56b8a349532d6e18fc106cd48e5 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ export GIT_COMMITTER_DATE='1530000000 +0100'
 export GIT_AUTHOR_DATE='1530000000 +0100'
 
 export LC_CTYPE=C.UTF-8
+unset CDPATH
 
 root=`pwd`
 troot=$root/tests
@@ -776,11 +777,12 @@ t-splitbrain-pushed-good-start () {
 
        t-refs-same-start
        t-ref-same refs/heads/split.p
-       case "$(t-git-get-ref refs/heads/split.b)" in
+       local split_b=$(t-git-get-ref refs/heads/split.b)
+       case "$split_b" in
        "$t_ref_val") ;;
        "$(git rev-parse refs/heads/split.p^0)") ;;
        "$(git rev-parse refs/heads/split.p^1)") ;;
-       *) fail 'bad b/p' ;;
+       *) fail "bad b/p (b=$split_b)" ;;
        esac
        t-pushed-good-core
 
@@ -1026,7 +1028,6 @@ t-git-pseudo-merge () {
 }
 
 t-gbp-example-prep-no-ff () {
-       t-tstunt-parsechangelog
        t-archive example 1.0-1
        t-git-none
        t-worktree 1.0
@@ -1186,7 +1187,7 @@ t-debpolicy () {
        t-dsd
        t-policy dgit-repos-policy-debian
 
-       mkdir $tmp/git
+       mkdir -p $tmp/git
        t-policy-admin create-db
 }
 
@@ -1235,7 +1236,6 @@ t-tagupl-test () {
        cd ../$p
 
        t-dgit fetch
-       t-pushed-good master
 }
 
 t-buildproductsdir-config () {