check for failure message in testsuccess/failure

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index d9851a48cfe065dcab121924f9752e4f6894078c..617daa2836eeb46de895cf8deaf6c8e3880461bc 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1205,8 +1205,18 @@ testsuccess() {
                msgtest 'Test for successful execution of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output"
-       if $@ >${OUTPUT} 2>&1; then
-               msgpass
+       if "$@" >${OUTPUT} 2>&1; then
+               if expr match "$1" '^apt.*' >/dev/null; then
+                       if grep -q -E '^E: ' "$OUTPUT"; then
+                               echo >&2
+                               cat >&2 $OUTPUT
+                               msgfail 'successful run, but output contains errors'
+                       else
+                               msgpass
+                       fi
+               else
+                       msgpass
+               fi
        else
                local EXITCODE=$?
                echo >&2
@@ -1223,13 +1233,24 @@ testfailure() {
                msgtest 'Test for failure in execution of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"
-       if $@ >${OUTPUT} 2>&1; then
+       if "$@" >${OUTPUT} 2>&1; then
                local EXITCODE=$?
                echo >&2
                cat >&2 $OUTPUT
                msgfail "exitcode $EXITCODE"
        else
-               msgpass
+               local EXITCODE=$?
+               if expr match "$1" '^apt.*' >/dev/null; then
+                       if ! grep -q -E '^E: ' "$OUTPUT"; then
+                               echo >&2
+                               cat >&2 $OUTPUT
+                               msgfail "run failed with exitcode ${EXITCODE}, but with no errors"
+                       else
+                               msgpass
+                       fi
+               else
+                       msgpass
+               fi
        fi
        aptautotest 'testfailure' "$@"
 }