merged lp:~mvo/apt/apt-get-changelog

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 82fca2046adc0ba55b79618294e296122fef10cd..f78ae2ee1516a4c185d2727793321ba9ad26bbc9 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -64,6 +64,8 @@ runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "
        if [ -f ./aptconfig.conf ]; then
                APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "
        if [ -f ./aptconfig.conf ]; then
                APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*

+        elif [ -f ../aptconfig.conf ]; then
+                APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*

        else
                LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
        fi
        else
                LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$*
        fi


@@ -72,22 +74,27 @@ aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }

+aptkey() { runapt apt-key $*; }
+dpkg() {
+       $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
+}

 
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))
 
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))

-       msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
+       msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "

        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)

-#      trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+       CURRENTTRAP="cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY"
+       trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM

        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir
        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir

-       mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache
-       mkdir -p var/log/apt var/lib/apt
+       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 var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers

-       local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
+       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
        if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
                cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
        else


@@ -97,7 +104,7 @@ setupenvironment() {
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..

-       local PACKAGESFILE=$(echo "$(basename $0)" | sed 's/^test-/Packages-/')
+       local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')

        if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
                cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
        else
        if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
                cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
        else


@@ -106,9 +113,11 @@ setupenvironment() {
        cp $(find $TESTDIR -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
        cp $(find $TESTDIR -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

        echo "Debug::NoLocking \"true\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
        echo "Debug::NoLocking \"true\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf

+       echo "Dir::Bin::methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf

        echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf


@@ -206,7 +215,7 @@ buildpackage() {
        fi
        local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)"
        local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")"
        fi
        local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)"
        local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")"

-       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')"
+       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"

        cd - > /dev/null
        for PKG in $PKGS; do
                echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
        cd - > /dev/null
        for PKG in $PKGS; do
                echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist


@@ -227,6 +236,10 @@ buildaptarchive() {
 
 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' ' ')"
 
 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
+               ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+       fi

        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        echo -n $(readlink -f .) >> ftparchive.conf
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        echo -n $(readlink -f .) >> ftparchive.conf


@@ -296,7 +309,7 @@ buildaptftparchivedirectorystructure() {
 }
 
 buildaptarchivefromincoming() {
 }
 
 buildaptarchivefromincoming() {

-       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on incoming packages…"
+       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on incoming packages…"

        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig
        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig


@@ -313,7 +326,7 @@ buildaptarchivefromincoming() {
 }
 
 buildaptarchivefromfiles() {
 }
 
 buildaptarchivefromfiles() {

-       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on prebuild files…"
+       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on prebuild files…"

        cd aptarchive
        if [ -f Packages ]; then
                msgninfo "\tPackages file… "
        cd aptarchive
        if [ -f Packages ]; then
                msgninfo "\tPackages file… "


@@ -373,17 +386,44 @@ setupaptarchive() {
        else
                setupflataptarchive
        fi
        else
                setupflataptarchive
        fi

-       msgninfo "\tSign archive with Joe Sixpack key… "
-       for RELEASE in $(find aptarchive/ -name Release); do
-               gpg --no-default-keyring --secret-keyring ./keys/joesixpack.sec --keyring ./keys/joesixpack.pub --default-key Joe -abs -o ${RELEASE}.gpg ${RELEASE}
-       done
-       msgdone "info"
+       signreleasefiles

        msgninfo "\tSync APT's cache with the archive… "
        aptget update -qq
        msgdone "info"
 }
 
        msgninfo "\tSync APT's cache with the archive… "
        aptget update -qq
        msgdone "info"
 }
 

-diff() {
+signreleasefiles() {
+       local SIGNER="${1:-Joe Sixpack}"
+       msgninfo "\tSign archive with $SIGNER key… "
+       local SECKEYS=""
+       for KEY in $(find keys/ -name '*.sec'); do
+               SECKEYS="$SECKEYS --secret-keyring $KEY"
+       done
+       local PUBKEYS=""
+       for KEY in $(find keys/ -name '*.pub'); do
+               PUBKEYS="$PUBKEYS --keyring $KEY"
+       done
+       for RELEASE in $(find aptarchive/ -name Release); do
+               gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE}
+       done
+       msgdone "info"
+}
+
+changetowebserver() {
+       if which weborf > /dev/null; then
+               weborf -xb aptarchive/ 2>&1 > /dev/null &
+               CURRENTTRAP="kill $(ps | grep weborf | sed -e 's#^[ ]*##' | cut -d' ' -f 1); $CURRENTTRAP"
+               trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+               local APTARCHIVE="file://$(readlink -f ./aptarchive)"
+               for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
+                       sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#"
+               done
+               return 0
+       fi
+       return 1
+}
+
+checkdiff() {

        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
                echo
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
                echo


@@ -399,9 +439,9 @@ testfileequal() {
        shift
        msgtest "Test for correctness of file" "$FILE"
        if [ -z "$*" ]; then
        shift
        msgtest "Test for correctness of file" "$FILE"
        if [ -z "$*" ]; then

-               echo -n "" | diff $FILE - && msgpass || msgfail
+               echo -n "" | checkdiff $FILE - && msgpass || msgfail

        else
        else

-               echo "$*" | diff $FILE - && msgpass || msgfail
+               echo "$*" | checkdiff $FILE - && msgpass || msgfail

        fi
 }
 
        fi
 }
 


@@ -410,7 +450,7 @@ testequal() {
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"

-       $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail
+       $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail

        rm $COMPAREFILE
 }
 
        rm $COMPAREFILE
 }
 


@@ -423,10 +463,10 @@ testequalor2() {
        shift 2
        msgtest "Test for equality OR of" "$*"
        $* 2>&1 1> $COMPAREAGAINST
        shift 2
        msgtest "Test for equality OR of" "$*"
        $* 2>&1 1> $COMPAREAGAINST

-       (diff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
-               diff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
-               ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \
-                      "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" &&
+       (checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
+               checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
+               ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \
+                      "\n${CINFO}Diff against OR 2${CNORMAL}" "$(checkdiff $COMPAREFILE2 $COMPAREAGAINST)" &&

                  msgfail )
        rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST
 }
                  msgfail )
        rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST
 }


@@ -448,7 +488,7 @@ N: No packages found"
        local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
        eval `apt-config shell ARCH APT::Architecture`
        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
        local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
        eval `apt-config shell ARCH APT::Architecture`
        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE

-       aptcache show $PACKAGE 2>&1 | diff $COMPAREFILE - && msgpass || msgfail
+       aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail

        rm $COMPAREFILE
 }
 
        rm $COMPAREFILE
 }
 


@@ -463,3 +503,27 @@ testnopackage() {
        fi
        msgpass
 }
        fi
        msgpass
 }

+
+testdpkginstalled() {
+       msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^i]' | wc -l)"
+       if [ "$PKGS" != 0 ]; then
+               echo $PKGS
+               dpkg -l $* | grep '^[a-z]'
+               msgfail
+               return 1
+       fi
+       msgpass
+}
+
+testdpkgnoninstalled() {
+       msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+       if [ "$PKGS" != 0 ]; then
+               echo
+               dpkg -l $* | grep '^[a-z]'
+               msgfail
+               return 1
+       fi
+       msgpass
+}