Test suite: Make t-expect-push-fail out of the remains of mustfail

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 9948c31407433ed5ea49c525e40ef490a0599656..f45dd0b2bb80ecbdec39807d471cac72bf2f531d 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -2,6 +2,7 @@
 
 exec 2>&1
 set -x
 
 exec 2>&1
 set -x

+set -o pipefail

 
 . tests/lib-core
 
 
 . tests/lib-core
 


@@ -43,9 +44,51 @@ END
 
 t-expect-fail () {
        local mpat="$1"; shift
 
 t-expect-fail () {
        local mpat="$1"; shift

+
+       local grepper=fgrep
+       case "$mpat" in
+       [A-Z]:*)
+               case "$mpat" in
+               E:*)    grepper=egrep   ;;
+               F:*)    grepper=fgrep   ;;
+               *)      fail "bad mpat prefix in $mpat";;
+               esac
+               mpat=${mpat#[A-Z]:}
+               ;;
+       esac
+
+       set +o pipefail

        LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
        LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output

-       test ${PIPESTATUS[0]} != 0
-       egrep "$mpat" $tmp/t.output ||false
+       local ps="${PIPESTATUS[*]}"
+       set -o pipefail
+
+       case $ps in
+       "0 0")  fail "command unexpectedly succeeded (instead of: $mpat)" ;;
+       *" 0")  ;;
+       *)      fail "tee failed"  ;;
+       esac
+
+       $grepper -e "$mpat" $tmp/t.output ||
+               fail "error message not found"
+}
+
+t-expect-push-fail () {
+       local mpat="$1"; shift
+       t-reporefs pre-push
+       t-expect-fail "$mpat"  "$@"
+       t-reporefs post-push
+       diff $tmp/show-refs.{pre,post}-push
+}
+
+t-reporefs () {
+       local whichoutput=$1; shift
+       local outputfile="$tmp/show-refs.$whichoutput"
+       (set -e
+        exec >"$outputfile"
+        if test -d $tmp/git/$p.git; then
+               cd $tmp/git/$p.git
+               git show-ref |sort
+       fi)

 }
 
 t-untar () {
 }
 
 t-untar () {


@@ -241,7 +284,11 @@ t-clean-on-branch () {
 
 t-git-get-ref () {
        local ref=$1
 
 t-git-get-ref () {
        local ref=$1

-       git show-ref -d $1 | perl -ne '
+       case "$ref" in
+       refs/*) ;;
+       *) fail "t-git-get-ref bad $ref" ;;
+       esac
+       (git show-ref -d $1 || test $? = 1) | perl -ne '

                $x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
                END { print "$x\n" if length $x; }
        '
                $x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
                END { print "$x\n" if length $x; }
        '


@@ -366,8 +413,9 @@ t-ref-dsc-dgit () {
 t-apply-diff () {
        local v1=$1
        local v2=$2
 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 () {
 }
 
 t-commit () {