Test suite: Prepare for pipefail in t-apply-diff

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index e6ca6fb399b4a5b6167bbddd3bf4263606a037ea..e960c1c62c33f60c76a27f83cd212aac0b8fcc2a 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -225,7 +225,7 @@ t-cloned-fetched-good () {
        t-refs-same \
                refs/heads/dgit/sid \
                refs/remotes/dgit/dgit/sid
-       t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
+       t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable
 }
 
 t-output () {
@@ -241,6 +241,10 @@ t-clean-on-branch () {
 
 t-git-get-ref () {
        local ref=$1
+       case "$ref" in
+       refs/*) ;;
+       *) fail "t-git-get-ref bad $ref" ;;
+       esac
        git show-ref -d $1 | perl -ne '
                $x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
                END { print "$x\n" if length $x; }
@@ -366,8 +370,9 @@ t-ref-dsc-dgit () {
 t-apply-diff () {
        local v1=$1
        local v2=$2
-       (cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
-               | patch -p1 -u
+       (cd $troot/pkg-srcs;
+        debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc || test $? = 1) \
+        | patch -p1 -u
 }
 
 t-commit () {