adapt to the new CacheSetHelper API

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 8f1e7cca5a93b346852436c174e3b63fd8f75ae7..7cf4d8a6da02b3f5c55c1291b5c32c63623b685e 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -4,7 +4,7 @@ EXIT_CODE=0
 
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ]; then
 
 # we all like colorful messages
 if [ "$MSGCOLOR" != 'NO' ]; then

-       if ! expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+       if [ ! -t 1 ]; then # but check that we output to a terminal

                export MSGCOLOR='NO'
        fi
 fi
                export MSGCOLOR='NO'
        fi
 fi


@@ -1019,7 +1019,13 @@ testfileequal() {
 
 testempty() {
        msgtest "Test for no output of" "$*"
 
 testempty() {
        msgtest "Test for no output of" "$*"

-       test -z "$($* 2>&1)" && msgpass || msgfail
+       local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"
+       if $* >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then
+               msgpass
+       else
+               cat $COMPAREFILE
+               msgfail
+       fi

 }
 
 testequal() {
 }
 
 testequal() {