]> 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
report failures via exit and ensure we don't overflow
[apt.git] / test / integration / framework
diff --git a/test/integration/framework b/test/integration/framework
index d7526a100b5f0fac448805e3d7eed1331fdb3bd4..cdaa20627edaf12e89413738ac0b64857f97f395 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1,5 +1,7 @@
 #!/bin/sh -- # no runable script, just for vi
 
 #!/bin/sh -- # no runable script, just for vi
 
+TESTFAILURES=0
+
 # we all like colorful messages
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
    expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then
 # we all like colorful messages
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
    expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then
@@ -29,13 +31,14 @@ msgtest() {
        while [ -n "$1" ]; do
                echo -n "${CINFO}$1${CCMD} " >&2;
                echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " >&2;
        while [ -n "$1" ]; do
                echo -n "${CINFO}$1${CCMD} " >&2;
                echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " >&2;
-               shift 2
+               shift
+               if [ -n "$1" ]; then shift; else break; fi
        done
        echo -n "…${CNORMAL} " >&2;
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
        done
        echo -n "…${CNORMAL} " >&2;
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
-msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; }
+msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES=$((TESTFAILURES+1)); }
 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}
 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}
@@ -90,6 +93,7 @@ runapt() {
 }
 aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 }
 aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
+aptcdrom() { runapt apt-cdrom $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }
@@ -106,17 +110,30 @@ aptitude() {
                LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
        fi
 }
                LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
        fi
 }
+gdb() {
+       echo "gdb: run »$*«"
+       APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1
+}
+
+exitwithstatus() {
+        # error if we about to overflow, but ...
+        #   "255 failures ought to be enough for everybody"
+        if [ $TESTFAILURES -gt 255 ]; then
+            msgdie "Total failure count $TESTFAILURES too big"
+        fi
+        exit $((TESTFAILURES <= 255 ? TESTFAILURES : 255));
+}
 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"
 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"
-       trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+       trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
 }
 
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
-       local TESTDIR=$(readlink -f $(dirname $0))
+       TESTDIRECTORY=$(readlink -f $(dirname $0))
        msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
        msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
-       BUILDDIRECTORY="${TESTDIR}/../../build/bin"
+       BUILDDIRECTORY="${TESTDIRECTORY}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY;"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY;"
@@ -126,25 +143,19 @@ setupenvironment() {
        mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
        mkdir -p var/cache var/lib var/log
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
        mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
        mkdir -p var/cache var/lib var/log
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
-       local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
-       if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
-               cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
-       else
-               touch var/lib/dpkg/status
-       fi
        touch var/lib/dpkg/available
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
        local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
        touch var/lib/dpkg/available
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
        local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
-       if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
-               cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
+       if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then
+               cp "${TESTDIRECTORY}/${PACKAGESFILE}" aptarchive/Packages
        fi
        local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
        fi
        local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
-       if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
-               cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
+       if [ -f "${TESTDIRECTORY}/${SOURCESSFILE}" ]; then
+               cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
        fi
        fi
-       cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
+       cp $(find $TESTDIRECTORY -name '*.pub' -o -name '*.sec') keys/
        ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
        ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
@@ -156,7 +167,9 @@ setupenvironment() {
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
-       echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
+       if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
+               echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
+       fi
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        export LC_ALL=C
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        export LC_ALL=C
@@ -170,13 +183,17 @@ getarchitecture() {
                if [ -n "$ARCH" ]; then
                        echo $ARCH
                else
                if [ -n "$ARCH" ]; then
                        echo $ARCH
                else
-                       dpkg-architecture -qDEB_BUILD_ARCH
+                       dpkg --print-architecture
                fi
        else
                echo $1
        fi
 }
 
                fi
        else
                echo $1
        fi
 }
 
+getarchitectures() {
+       echo "$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+}
+
 configarchitecture() {
        local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf
        rm -f $CONFFILE
 configarchitecture() {
        local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf
        rm -f $CONFFILE
@@ -186,6 +203,32 @@ configarchitecture() {
                echo "APT::Architectures:: \"$(getarchitecture $1)\";" >> $CONFFILE
                shift
        done
                echo "APT::Architectures:: \"$(getarchitecture $1)\";" >> $CONFFILE
                shift
        done
+       configdpkg
+}
+
+configdpkg() {
+       if [ ! -e rootdir/var/lib/dpkg/status ]; then
+               local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
+               if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
+                       cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
+               else
+                       echo -n > rootdir/var/lib/dpkg/status
+               fi
+       fi
+       if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then
+               local ARCHS="$(getarchitectures)"
+               if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
+                       DPKGARCH="$(dpkg --print-architecture)"
+                       for ARCH in ${ARCHS}; do
+                               if [ "${ARCH}" != "${DPKGARCH}" ]; then dpkg --add-architecture ${ARCH}; fi
+                       done
+                       if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+                               # dpkg doesn't really check the version as long as it is fully installed,
+                               # but just to be sure we choose one above the required version
+                               insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
+                       fi
+               fi
+       fi
 }
 
 setupsimplenativepackage() {
 }
 
 setupsimplenativepackage() {
@@ -273,23 +316,28 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
 Section: $SECTION
 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
 Section: $SECTION
 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control
+       local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
+       test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control
+       echo "
+Package: $NAME" >> ${BUILDDIR}/debian/control
 
 
-Package: $NAME" > ${BUILDDIR}/debian/control
        if [ "$ARCH" = 'all' ]; then
                echo "Architecture: all" >> ${BUILDDIR}/debian/control
        else
                echo "Architecture: any" >> ${BUILDDIR}/debian/control
        fi
        if [ "$ARCH" = 'all' ]; then
                echo "Architecture: all" >> ${BUILDDIR}/debian/control
        else
                echo "Architecture: any" >> ${BUILDDIR}/debian/control
        fi
-       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> ${BUILDDIR}/debian/control
+       local DEPS="$(echo "$DEPENDENCIES" | grep -v '^Build-')"
+       test -z "$DEPS" || echo "$DEPS" >> ${BUILDDIR}/debian/control
        if [ -z "$DESCRIPTION" ]; then
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…" >> ${BUILDDIR}/debian/control
        else
        if [ -z "$DESCRIPTION" ]; then
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…" >> ${BUILDDIR}/debian/control
        else
-               echo "Description: $DESCRIPTION" >> ${BUILDIR}/debian/control
+               echo "Description: $DESCRIPTION" >> ${BUILDDIR}/debian/control
        fi
        fi
+
        echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
        local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
        for SRC in $SRCS; do
        echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
        local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
        for SRC in $SRCS; do
@@ -350,7 +398,7 @@ createaptftparchiveconfig() {
        local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
        if [ -z "$ARCHS" ]; then
                # the pool is empty, so we will operate on faked packages - let us use the configured archs
        local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
        if [ -z "$ARCHS" ]; then
                # the pool is empty, so we will operate on faked packages - let us use the configured archs
-               ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+               ARCHS="$(getarchitectures)"
        fi
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        fi
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
@@ -431,8 +479,8 @@ insertpackage() {
        local PRIORITY="${6:-optional}"
        local ARCHS=""
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
        local PRIORITY="${6:-optional}"
        local ARCHS=""
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
-               if [ "$arch" = "all" ]; then
-                       ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+               if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
+                       ARCHS="$(getarchitectures)"
                else
                        ARCHS="$arch"
                fi
                else
                        ARCHS="$arch"
                fi
@@ -445,9 +493,9 @@ insertpackage() {
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $arch
-Version: $VERSION
+Maintainer: Joe Sixpack <joe@example.org>" >> $FILE
+                       test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
+                       echo "Version: $VERSION
 Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
                        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                        echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
 Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
                        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                        echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
@@ -477,7 +525,8 @@ Architecture: $ARCH" >> $FILE
        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
        echo "Files:
  d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.dsc
        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
        echo "Files:
  d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.dsc
- d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.tar.gz" >> $FILE
+ d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.tar.gz
+" >> $FILE
 }
 
 insertinstalledpackage() {
 }
 
 insertinstalledpackage() {
@@ -486,22 +535,29 @@ insertinstalledpackage() {
        local VERSION="$3"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
        local VERSION="$3"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
-       local FILE="rootdir/var/lib/dpkg/status"
+       local STATUS="${6:-install ok installed}"
+       local FILE='rootdir/var/lib/dpkg/status'
+       local INFO='rootdir/var/lib/dpkg/info'
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
                echo "Package: $NAME
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
                echo "Package: $NAME
-Status: install ok installed
+Status: $STATUS
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $arch
 Version: $VERSION" >> $FILE
 Version: $VERSION" >> $FILE
+               test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/installed
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…
 " >> $FILE
                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/installed
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…
 " >> $FILE
+               if [ "$(dpkg-query -W --showformat='${Multi-Arch}')" = 'same' ]; then
+                       echo -n > ${INFO}/${NAME}:${arch}.list
+               else
+                       echo -n > ${INFO}/${NAME}.list
+               fi
        done
 }
 
        done
 }
 
@@ -525,7 +581,7 @@ buildaptarchivefromfiles() {
                msgninfo "\t${line} file… "
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                msgninfo "\t${line} file… "
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
-               cat ${line} | lzma > ${line}.lzma
+               cat ${line} | xz --format=lzma > ${line}.lzma
                cat ${line} | xz > ${line}.xz
                msgdone "info"
        done
                cat ${line} | xz > ${line}.xz
                msgdone "info"
        done
@@ -542,9 +598,6 @@ generatereleasefiles() {
        # both should be given in notation date/touch can understand
        msgninfo "\tGenerate Release files… "
        if [ -e aptarchive/dists ]; then
        # both should be given in notation date/touch can understand
        msgninfo "\tGenerate Release files… "
        if [ -e aptarchive/dists ]; then
-               for dir in $(find ./aptarchive/dists -mindepth 3 -maxdepth 3 -type d -name 'i18n'); do
-                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Patterns::='Translation-*' > $dir/Index
-               done
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
@@ -674,6 +727,21 @@ server.stat-cache-engine = \"disable\"" > lighttpd.conf
        return 0
 }
 
        return 0
 }
 
+changetocdrom() {
+       mkdir -p rootdir/media/cdrom/.disk
+       local CD="$(readlink -f rootdir/media/cdrom)"
+       echo "acquire::cdrom::mount \"${CD}\";" > rootdir/etc/apt/apt.conf.d/00cdrom
+       echo 'acquire::cdrom::autodetect 0;' >> rootdir/etc/apt/apt.conf.d/00cdrom
+       echo -n "$1" > ${CD}/.disk/info
+       if [ ! -d aptarchive/dists ]; then
+               msgdie 'Flat file archive cdroms can not be created currently'
+               return 1
+       fi
+       mv aptarchive/dists $CD
+       ln -s "$(readlink -f ./incoming)" $CD/pool
+       find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
+}
+
 checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
 checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
@@ -696,6 +764,11 @@ testfileequal() {
        fi
 }
 
        fi
 }
 
+testempty() {
+       msgtest "Test for no output of" "$*"
+       test -z "$($* 2>&1)" && msgpass || msgfail
+}
+
 testequal() {
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"
 testequal() {
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"
@@ -756,7 +829,7 @@ testnopackage() {
 
 testdpkginstalled() {
        msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
 
 testdpkginstalled() {
        msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
-       local PKGS="$(dpkg -l $* | grep '^i' | wc -l)"
+       local PKGS="$(dpkg -l $* 2>/dev/null | grep '^i' | wc -l)"
        if [ "$PKGS" != $# ]; then
                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
        if [ "$PKGS" != $# ]; then
                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
APT (for Cydia)