]> git.saurik.com Git - apt.git/blobdiff - test/integration/framework
projects / apt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
various changes to increase test-coverage
[apt.git] / test / integration / framework
diff --git a/test/integration/framework b/test/integration/framework
index b443f2a7b48432d03901fe37f7e1d991f8513b38..322c74a211923c374a4d9a52dc0b56e91994bb41 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -2,6 +2,20 @@
 
 EXIT_CODE=0
 
 
 EXIT_CODE=0
 
+while [ -n "$1" ]; do
+       if [ "$1" = "-q" ]; then
+               export MSGLEVEL=2
+       elif [ "$1" = "-v" ]; then
+               export MSGLEVEL=4
+       elif [ "$1" = '--color=no' ]; then
+               export MSGCOLOR='NO'
+       else
+               echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
+       fi
+       shift
+done
+export MSGLEVEL="${MSGLEVEL:-3}"
+
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
        if [ ! -t 1 ]; then # but check that we output to a terminal
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
        if [ ! -t 1 ]; then # but check that we output to a terminal
@@ -50,21 +64,49 @@ msgninfo() { msgprintf "${CINFO}I: %s" '%s' "${CNORMAL}" "$@"; }
 msgndebug() { msgprintf "${CDEBUG}D: %s" '%s' "${CNORMAL}" "$@"; }
 msgtest() { msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@"; }
 msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }
 msgndebug() { msgprintf "${CDEBUG}D: %s" '%s' "${CNORMAL}" "$@"; }
 msgtest() { msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@"; }
 msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }
+msgreportheader() {
+       if [ -n "$MSGTEST_MSG" ]; then
+               test "$1" != 'msgfailoutput' || echo
+               if [ -n "$MSGTEST_MSGMSG" ]; then
+                       echo "$MSGTEST_MSGMSG"
+               fi
+               if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
+                       echo "${CFAIL}Part of the test group: $MSGTEST_GRP"
+               fi
+               echo -n "$MSGTEST_MSG"
+               unset MSGTEST_MSG
+       fi
+}
 msgskip() {
 msgskip() {
+       msgreportheader 'msgskip'
        if [ $# -gt 0 ]; then printf "${CWARNING}SKIP: $*${CNORMAL}\n" >&2;
        else printf "${CWARNING}SKIP${CNORMAL}\n" >&2; fi
 }
 msgfail() {
        if [ $# -gt 0 ]; then printf "${CWARNING}SKIP: $*${CNORMAL}\n" >&2;
        else printf "${CWARNING}SKIP${CNORMAL}\n" >&2; fi
 }
 msgfail() {
-       if [ $# -gt 0 ]; then printf "${CFAIL}FAIL: $*${CNORMAL}\n" >&2;
+       msgreportheader 'msgfail'
+       if [ $# -gt 0 ] && [ -n "$1" ]; then printf "${CFAIL}FAIL: $*${CNORMAL}\n" >&2;
        else printf "${CFAIL}FAIL${CNORMAL}\n" >&2; fi
        if [ -n "$APT_DEBUG_TESTS" ]; then
                $SHELL
        fi
        EXIT_CODE=$((EXIT_CODE+1));
 }
        else printf "${CFAIL}FAIL${CNORMAL}\n" >&2; fi
        if [ -n "$APT_DEBUG_TESTS" ]; then
                $SHELL
        fi
        EXIT_CODE=$((EXIT_CODE+1));
 }
+MSGGROUP_LEVEL=0
+msggroup() {
+       if [ -n "$1" ]; then
+               if [ $MSGGROUP_LEVEL = 0 ]; then
+                       MSGTEST_GRP='NEXT'
+               fi
+               MSGGROUP_LEVEL=$((MSGGROUP_LEVEL+1));
+       else
+               MSGGROUP_LEVEL=$((MSGGROUP_LEVEL-1));
+               if [ $MSGGROUP_LEVEL = 0 ]; then
+                       unset MSGTEST_GRP
+               fi
+       fi
+}
 
 # enable / disable Debugging
 
 # enable / disable Debugging
-MSGLEVEL=${MSGLEVEL:-3}
 if [ $MSGLEVEL -le 0 ]; then
        msgdie() { true; }
 fi
 if [ $MSGLEVEL -le 0 ]; then
        msgdie() { true; }
 fi
@@ -73,9 +115,16 @@ if [ $MSGLEVEL -le 1 ]; then
        msgnwarn() { true; }
 fi
 if [ $MSGLEVEL -le 2 ]; then
        msgnwarn() { true; }
 fi
 if [ $MSGLEVEL -le 2 ]; then
-       msgmsg() { true; }
+       msgmsg() {
+               MSGTEST_MSGMSG="$(msgprintf "${CMSG}%s" '%s' "${CNORMAL}" "$@")"
+       }
        msgnmsg() { true; }
        msgnmsg() { true; }
-       msgtest() { true; }
+       msgtest() {
+               MSGTEST_MSG="$(msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@")"
+               if [ "$MSGTEST_GRP" = 'NEXT' ]; then
+                       MSGTEST_GRP="$MSGTEST_MSG"
+               fi
+       }
        msgpass() { printf " ${CPASS}P${CNORMAL}"; }
 fi
 if [ $MSGLEVEL -le 3 ]; then
        msgpass() { printf " ${CPASS}P${CNORMAL}"; }
 fi
 if [ $MSGLEVEL -le 3 ]; then
@@ -150,10 +199,14 @@ gdb() {
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;
+       dpkg) shift; runapt ${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg "$@"; return;;
        *) CMD="$1";;
        esac
        shift
        *) CMD="$1";;
        esac
        shift
-       runapt command gdb --quiet -ex run "${BUILDDIRECTORY}/$CMD" --args "${BUILDDIRECTORY}/$CMD" "$@"
+       if [ "${CMD##*/}" = "$CMD" ]; then
+               CMD="${BUILDDIRECTORY}/${CMD}"
+       fi
+       runapt command gdb --quiet -ex run "$CMD" --args "$CMD" "$@"
 }
 
 exitwithstatus() {
 }
 
 exitwithstatus() {
@@ -191,7 +244,7 @@ setupenvironment() {
        fi
        TMPWORKINGDIRECTORY=$(mktemp -d)
        addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;"
        fi
        TMPWORKINGDIRECTORY=$(mktemp -d)
        addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;"
-       msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
+       msgninfo "Preparing environment for $(basename $0) in ${TMPWORKINGDIRECTORY}…"
 
        mkdir -m 700 "${TMPWORKINGDIRECTORY}/downloaded"
        if [ "$(id -u)" = '0' ]; then
 
        mkdir -m 700 "${TMPWORKINGDIRECTORY}/downloaded"
        if [ "$(id -u)" = '0' ]; then
@@ -273,11 +326,25 @@ if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
                export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
        fi
 fi
                export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
        fi
 fi
-exec fakeroot dpkg --root="${TMPWORKINGDIRECTORY}/rootdir" \\
+exec fakeroot ${DPKG:-dpkg} --root="${TMPWORKINGDIRECTORY}/rootdir" \\
        --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
        --force-not-root --force-bad-path "\$@"
 EOF
        --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
        --force-not-root --force-bad-path "\$@"
 EOF
-       chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+       cat << EOF > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
+#!/bin/sh
+set -e
+if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
+       if [ -n "\$LD_PRELOAD" ]; then
+               export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}"
+       else
+               export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
+       fi
+fi
+exec fakeroot gdb --quiet -ex run "${DPKG:-dpkg}" --args "${DPKG:-dpkg}" --root="${TMPWORKINGDIRECTORY}/rootdir" \\
+       --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
+       --force-not-root --force-bad-path "\$@"
+EOF
+       chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
        echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
 
        {
        echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
 
        {
@@ -320,7 +387,6 @@ EOF
        export LC_ALL=C.UTF-8
        unset LANGUAGE APT_CONFIG
        unset GREP_OPTIONS DEB_BUILD_PROFILES
        export LC_ALL=C.UTF-8
        unset LANGUAGE APT_CONFIG
        unset GREP_OPTIONS DEB_BUILD_PROFILES
-
        msgdone "info"
 }
 
        msgdone "info"
 }
 
@@ -474,7 +540,7 @@ Dir::Bin::xz \"/does/not/exist\";" > "$CONFFILE"
                COMPRESSOR_CMD='xz --format=lzma'
        else
                msgtest 'Test for availability of compressor' "${COMPRESSOR}"
                COMPRESSOR_CMD='xz --format=lzma'
        else
                msgtest 'Test for availability of compressor' "${COMPRESSOR}"
-               msgfail
+               msgfail "${COMPRESSOR} not available"
        fi
 }
 
        fi
 }
 
@@ -794,6 +860,7 @@ insertsource() {
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"
+        local BINARY="${6:-$NAME}"
        local ARCHS=""
        local SPATH="aptarchive/dists/${RELEASE}/main/source"
        mkdir -p $SPATH
        local ARCHS=""
        local SPATH="aptarchive/dists/${RELEASE}/main/source"
        mkdir -p $SPATH
@@ -801,7 +868,7 @@ insertsource() {
        local DSCFILE="${NAME}_${VERSION}.dsc"
        local TARFILE="${NAME}_${VERSION}.tar.gz"
        echo "Package: $NAME
        local DSCFILE="${NAME}_${VERSION}.dsc"
        local TARFILE="${NAME}_${VERSION}.tar.gz"
        echo "Package: $NAME
-Binary: $NAME
+Binary: $BINARY
 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE
 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE
@@ -809,6 +876,9 @@ Architecture: $ARCH" >> $FILE
        echo "Files:
  $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
  $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
        echo "Files:
  $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
  $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
+Checksums-Sha256:
+ $(echo -n "$DSCFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
+ $(echo -n "$TARFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
 " >> $FILE
 }
 
 " >> $FILE
 }
 
@@ -1070,8 +1140,9 @@ webserverconfig() {
        if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then
                msgpass
        else
        if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then
                msgpass
        else
-               cat "$DOWNLOG" "$STATUS" || true
-               msgfail
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/webserverconfig.output"
+               cat "$DOWNLOG" "$STATUS" >"$OUTPUT" 2>&1 || true
+               msgfailoutput '' "$OUTPUT"
        fi
        $NOCHECK || testwebserverlaststatuscode '200'
 }
        fi
        $NOCHECK || testwebserverlaststatuscode '200'
 }
@@ -1194,31 +1265,55 @@ checkdiff() {
        fi
 }
 
        fi
 }
 
+testoutputequal() {
+       local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testoutputequal.output"
+       local COMPAREFILE="$1"
+       shift
+       if "$@" 2>&1 | checkdiff $COMPAREFILE - >"$OUTPUT" 2>&1; then
+               msgpass
+       else
+               echo "=== content of file we compared with (${COMPAREFILE}) ===" >>"${OUTPUT}"
+               cat "$COMPAREFILE" >>"${OUTPUT}"
+               msgfailoutput '' "$OUTPUT" "$@"
+       fi
+}
+
 testfileequal() {
 testfileequal() {
+       msggroup 'testfileequal'
+       local MSG='Test for correctness of file'
+       if [ "$1" = '--nomsg' ]; then
+               MSG=''
+               shift
+       fi
        local FILE="$1"
        shift
        local FILE="$1"
        shift
-       msgtest "Test for correctness of file" "$FILE"
+       if [ -n "$MSG" ]; then
+               msgtest "$MSG" "$FILE"
+       fi
+       local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfileequal.output"
        if [ -z "$*" ]; then
        if [ -z "$*" ]; then
-               echo -n "" | checkdiff - $FILE && msgpass || msgfail
+               testoutputequal "$FILE" echo -n ''
        else
        else
-               echo "$*" | checkdiff - $FILE && msgpass || msgfail
+               testoutputequal "$FILE" echo "$*"
        fi
        fi
+       msggroup
 }
 
 testempty() {
 }
 
 testempty() {
+       msggroup 'testempty'
        msgtest "Test for no output of" "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"
        msgtest "Test for no output of" "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"
-       if "$@" >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then
+       if ("$@" >$COMPAREFILE 2>&1 || true) && test ! -s $COMPAREFILE; then
                msgpass
        else
                msgpass
        else
-               echo
-               cat $COMPAREFILE
-               msgfail
+               msgfailoutput '' "$COMPAREFILE" "$@"
        fi
        aptautotest 'testempty' "$@"
        fi
        aptautotest 'testempty' "$@"
+       msggroup
 }
 
 testequal() {
 }
 
 testequal() {
+       msggroup 'testequal'
        local MSG='Test of equality of'
        if [ "$1" = '--nomsg' ]; then
                MSG=''
        local MSG='Test of equality of'
        if [ "$1" = '--nomsg' ]; then
                MSG=''
@@ -1232,11 +1327,13 @@ testequal() {
        if [ -n "$MSG" ]; then
                msgtest "$MSG" "$*"
        fi
        if [ -n "$MSG" ]; then
                msgtest "$MSG" "$*"
        fi
-       "$@" 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+       testoutputequal "$COMPAREFILE" "$@"
        aptautotest 'testequal' "$@"
        aptautotest 'testequal' "$@"
+       msggroup
 }
 
 testequalor2() {
 }
 
 testequalor2() {
+       msggroup 'testequalor2'
        local COMPAREFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile1"
        local COMPAREFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile2"
        local COMPAREAGAINST="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.compareagainst"
        local COMPAREFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile1"
        local COMPAREFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile2"
        local COMPAREAGAINST="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.compareagainst"
@@ -1250,16 +1347,19 @@ testequalor2() {
        then
                msgpass
        else
        then
                msgpass
        else
-               echo -n "\n${CINFO}Diff against OR 1${CNORMAL}"
-               checkdiff $COMPAREFILE1 $COMPAREAGAINST || true
-               echo -n "${CINFO}Diff against OR 2${CNORMAL}"
-               checkdiff $COMPAREFILE2 $COMPAREAGAINST || true
-               msgfail
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.output"
+               echo -n "\n${CINFO}Diff against OR 1${CNORMAL}" >"$OUTPUT" 2>&1
+               checkdiff "$COMPAREFILE1" "$COMPAREAGAINST" >"$OUTPUT" 2>&1 || true
+               echo -n "${CINFO}Diff against OR 2${CNORMAL}" >"$OUTPUT" 2>&1
+               checkdiff "$COMPAREFILE2" "$COMPAREAGAINST" >"$OUTPUT" 2>&1 || true
+               msgfailoutput '' "$OUTPUT"
        fi
        aptautotest 'testequalor2' "$@"
        fi
        aptautotest 'testequalor2' "$@"
+       msggroup
 }
 
 testshowvirtual() {
 }
 
 testshowvirtual() {
+       msggroup 'testshowvirtual'
        local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
        local PACKAGE="$1"
        shift
        local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
        local PACKAGE="$1"
        shift
@@ -1274,46 +1374,58 @@ N: Can't select versions from package '$1' as it is purely virtual"
 N: No packages found"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.comparefile"
        local ARCH="$(getarchitecture 'native')"
 N: No packages found"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.comparefile"
        local ARCH="$(getarchitecture 'native')"
-       echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
-       aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+       echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' >"$COMPAREFILE"
+       local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.output"
+       testoutputequal "$COMPAREFILE" aptcache show -q=0 "$PACKAGE"
+       msggroup
 }
 
 testnopackage() {
 }
 
 testnopackage() {
+       msggroup 'testnopackage'
        msgtest "Test for non-existent packages" "apt-cache show $*"
        local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')"
        if [ -n "$SHOWPKG" ]; then
        msgtest "Test for non-existent packages" "apt-cache show $*"
        local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')"
        if [ -n "$SHOWPKG" ]; then
-               echo >&2
-               echo >&2 "$SHOWPKG"
-               msgfail
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testnopackage.output"
+               echo "$SHOWPKG" >"$OUTPUT"
+               msgfailoutput '' "$OUTPUT"
        else
                msgpass
        fi
        else
                msgpass
        fi
+       msggroup
 }
 
 testdpkgstatus() {
 }
 
 testdpkgstatus() {
+       msggroup 'testdpkgstatus'
        local STATE="$1"
        local NR="$2"
        shift 2
        msgtest "Test that $NR package(s) are in state $STATE with" "dpkg -l $*"
        local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)"
        if [ "$PKGS" != $NR ]; then
        local STATE="$1"
        local NR="$2"
        shift 2
        msgtest "Test that $NR package(s) are in state $STATE with" "dpkg -l $*"
        local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)"
        if [ "$PKGS" != $NR ]; then
-               echo >&2 $PKGS
-               dpkg -l "$@" | grep '^[a-z]' >&2 || true
-               msgfail
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testnopackage.output"
+               echo "$PKGS" >"$OUTPUT"
+               dpkg -l "$@" | grep '^[a-z]' >"$OUTPUT" >&2 || true
+               msgfailoutput '' "$OUTPUT"
        else
                msgpass
        fi
        else
                msgpass
        fi
+       msggroup
 }
 
 testdpkginstalled() {
 }
 
 testdpkginstalled() {
+       msggroup 'testdpkginstalled'
        testdpkgstatus 'ii' "$#" "$@"
        testdpkgstatus 'ii' "$#" "$@"
+       msggroup
 }
 
 testdpkgnotinstalled() {
 }
 
 testdpkgnotinstalled() {
+       msggroup 'testdpkgnotinstalled'
        testdpkgstatus 'ii' '0' "$@"
        testdpkgstatus 'ii' '0' "$@"
+       msggroup
 }
 
 testmarkedauto() {
 }
 
 testmarkedauto() {
+       msggroup 'testmarkedauto'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedauto.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as auto-installed' "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedauto.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as auto-installed' "$*"
@@ -1322,9 +1434,11 @@ testmarkedauto() {
                msgtest 'Test for correctly marked as auto-installed' 'no package'
                echo -n > $COMPAREFILE
        fi
                msgtest 'Test for correctly marked as auto-installed' 'no package'
                echo -n > $COMPAREFILE
        fi
-       aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+       testoutputequal "$COMPAREFILE" aptmark showauto
+       msggroup
 }
 testmarkedmanual() {
 }
 testmarkedmanual() {
+       msggroup 'testmarkedmanual'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedmanual.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as manually installed' "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedmanual.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as manually installed' "$*"
@@ -1333,26 +1447,33 @@ testmarkedmanual() {
                msgtest 'Test for correctly marked as manually installed' 'no package'
                echo -n > $COMPAREFILE
        fi
                msgtest 'Test for correctly marked as manually installed' 'no package'
                echo -n > $COMPAREFILE
        fi
-       aptmark showmanual 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+       testoutputequal "$COMPAREFILE" aptmark showmanual
+       msggroup
 }
 
 msgfailoutput() {
 }
 
 msgfailoutput() {
+       msgreportheader 'msgfailoutput'
        local MSG="$1"
        local OUTPUT="$2"
        shift 2
        local MSG="$1"
        local OUTPUT="$2"
        shift 2
-       echo >&2
        if [ "$1" = 'grep' ]; then
        if [ "$1" = 'grep' ]; then
+               echo >&2
                while [ -n "$2" ]; do shift; done
                echo "#### Complete file: $1 ####"
                cat >&2 "$1" || true
                echo '#### grep output ####'
        elif [ "$1" = 'test' ]; then
                while [ -n "$2" ]; do shift; done
                echo "#### Complete file: $1 ####"
                cat >&2 "$1" || true
                echo '#### grep output ####'
        elif [ "$1" = 'test' ]; then
+               echo >&2
                # doesn't support ! or non-file flags
                msgfailoutputstatfile() {
                        local FILEFLAGS='^-[bcdefgGhkLOprsStuwx]$'
                        if expr match "$1" "$FILEFLAGS" >/dev/null; then
                                echo "#### stat(2) of file: $2 ####"
                                stat "$2" || true
                # doesn't support ! or non-file flags
                msgfailoutputstatfile() {
                        local FILEFLAGS='^-[bcdefgGhkLOprsStuwx]$'
                        if expr match "$1" "$FILEFLAGS" >/dev/null; then
                                echo "#### stat(2) of file: $2 ####"
                                stat "$2" || true
+                               if test -e "$2"; then
+                                       echo "#### Complete file: $2 ####"
+                                       cat >&2 "$2" || true
+                               fi
                        fi
                }
                msgfailoutputstatfile "$2" "$3"
                        fi
                }
                msgfailoutputstatfile "$2" "$3"
@@ -1367,6 +1488,7 @@ msgfailoutput() {
 }
 
 testsuccess() {
 }
 
 testsuccess() {
+       msggroup 'testsuccess'
        if [ "$1" = '--nomsg' ]; then
                shift
        else
        if [ "$1" = '--nomsg' ]; then
                shift
        else
@@ -1399,8 +1521,10 @@ testsuccess() {
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        fi
        aptautotest 'testsuccess' "$@"
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        fi
        aptautotest 'testsuccess' "$@"
+       msggroup
 }
 testwarning() {
 }
 testwarning() {
+       msggroup 'testwarning'
        if [ "$1" = '--nomsg' ]; then
                shift
        else
        if [ "$1" = '--nomsg' ]; then
                shift
        else
@@ -1423,13 +1547,13 @@ testwarning() {
                fi
        else
                local EXITCODE=$?
                fi
        else
                local EXITCODE=$?
-               echo >&2
-               cat >&2 $OUTPUT
-               msgfail "exitcode $EXITCODE"
+               msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        fi
        aptautotest 'testwarning' "$@"
        fi
        aptautotest 'testwarning' "$@"
+       msggroup
 }
 testfailure() {
 }
 testfailure() {
+       msggroup 'testfailure'
        if [ "$1" = '--nomsg' ]; then
                shift
        else
        if [ "$1" = '--nomsg' ]; then
                shift
        else
@@ -1465,59 +1589,71 @@ testfailure() {
                fi
        fi
        aptautotest 'testfailure' "$@"
                fi
        fi
        aptautotest 'testfailure' "$@"
+       msggroup
 }
 
 }
 
+testreturnstateequal() {
+       local STATE="$1"
+       msggroup "${STATE}equal"
+       if [ "$2" != '--nomsg' ]; then
+               local CMP="$2"
+               shift 2
+               "$STATE" "$@"
+               testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+       else
+               local CMP="$3"
+               shift 3
+               "$STATE" --nomsg "$@"
+               testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+       fi
+       msggroup
+}
 testsuccessequal() {
 testsuccessequal() {
-       local CMP="$1"
-       shift
-       testsuccess "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$CMP"
+       testreturnstateequal 'testsuccess' "$@"
 }
 testwarningequal() {
 }
 testwarningequal() {
-       local CMP="$1"
-       shift
-       testwarning "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" "$CMP"
+       testreturnstateequal 'testwarning' "$@"
 }
 testfailureequal() {
 }
 testfailureequal() {
-       local CMP="$1"
-       shift
-       testfailure "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" "$CMP"
+       testreturnstateequal 'testfailure' "$@"
 }
 
 testfailuremsg() {
 }
 
 testfailuremsg() {
+       msggroup 'testfailuremsg'
        local CMP="$1"
        shift
        testfailure "$@"
        msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
        local CMP="$1"
        shift
        testfailure "$@"
        msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
-       grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailureequal.output" 2>&1 || true
-       if echo "$CMP" | checkdiff - "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailureequal.output"; then
-               msgpass
-       else
-               echo '### Complete output ###'
-               cat "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"
-               msgfail
-       fi
+       local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailuremsg.comparefile"
+       grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+       testoutputequal "$COMPAREFILE" echo "$CMP"
+       msggroup
 }
 
 testfilestats() {
 }
 
 testfilestats() {
+       msggroup 'testfilestats'
        msgtest "Test that file $1 has $2 $3" "$4"
        if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
                msgpass
        else
        msgtest "Test that file $1 has $2 $3" "$4"
        if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
                msgpass
        else
-               echo >&2
-               ls -ld >&2 "$1" || true
-               echo -n >&2 "stat(1) reports for $2: "
-               stat --format "$2" "$1" || true
-               msgfail
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfilestats.output"
+               {
+                       ls -ld "$1" || true
+                       echo -n "stat(1) reports for $2: "
+                       stat --format "$2" "$1" || true
+               } >"$OUTPUT" 2>&1
+               msgfailoutput '' "$OUTPUT"
        fi
        fi
+       msggroup
 }
 testaccessrights() {
 }
 testaccessrights() {
+       msggroup 'testaccessrights'
        testfilestats "$1" '%a' '=' "$2"
        testfilestats "$1" '%a' '=' "$2"
+       msggroup
 }
 
 testwebserverlaststatuscode() {
 }
 
 testwebserverlaststatuscode() {
+       msggroup 'testwebserverlaststatuscode'
        local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log'
        local STATUS='downloaded/webserverstatus-statusfile.log'
        rm -f "$DOWNLOG" "$STATUS"
        local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log'
        local STATUS='downloaded/webserverstatus-statusfile.log'
        rm -f "$DOWNLOG" "$STATUS"
@@ -1525,16 +1661,19 @@ testwebserverlaststatuscode() {
        if downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" && [ "$(cat "$STATUS")" = "$1" ]; then
                msgpass
        else
        if downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" && [ "$(cat "$STATUS")" = "$1" ]; then
                msgpass
        else
-               echo >&2
-               if [ -n "$2" ]; then
-                       shift
-                       echo >&2 '#### Additionally provided output files contain:'
-                       cat >&2 "$@"
-               fi
-               echo >&2 '#### Download log of the status code:'
-               cat >&2 "$DOWNLOG"
-               msgfail "Status was $(cat "$STATUS")"
+               local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwebserverlaststatuscode.output"
+               {
+                       if [ -n "$2" ]; then
+                               shift
+                               echo >&2 '#### Additionally provided output files contain:'
+                               cat >&2 "$@"
+                       fi
+                       echo >&2 '#### Download log of the status code:'
+                       cat >&2 "$DOWNLOG"
+               } >"$OUTPUT" 2>&1
+               msgfailoutput "Status was $(cat "$STATUS")" "$OUTPUT"
        fi
        fi
+       msggroup
 }
 
 pause() {
 }
 
 pause() {
@@ -1554,7 +1693,7 @@ listcurrentlistsdirectory() {
        } | sort
 }
 
        } | sort
 }
 
-### convinience hacks ###
+### convenience hacks ###
 mkdir() {
        # creating some directories by hand is a tedious task, so make it look simple
        if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
 mkdir() {
        # creating some directories by hand is a tedious task, so make it look simple
        if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
APT (for Cydia)