add wrapper around dpkg to be able to use it easily in the tests

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 01b795ba9ccccaefc50347979ffb1eeae3da0b2e..ba5f9dfa3fb15842cfc8fa2818ba89915d7015d0 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,15 +72,19 @@ 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 $*; }

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

 
 setupenvironment() {
 
 setupenvironment() {

-       local TMPWORKINGDIRECTORY=$(mktemp -d)
+       TMPWORKINGDIRECTORY=$(mktemp -d)

        local TESTDIR=$(readlink -f $(dirname $0))
        msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        local TESTDIR=$(readlink -f $(dirname $0))
        msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
        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


@@ -128,7 +132,7 @@ configarchitecture() {
        done
 }
 
        done
 }
 

-buildsimplenativepackage() {
+setupsimplenativepackage() {

        local NAME="$1"
        local ARCH="$2"
        local VERSION="$3"
        local NAME="$1"
        local ARCH="$2"
        local VERSION="$3"


@@ -142,7 +146,6 @@ buildsimplenativepackage() {
        else
                DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
        fi
        else
                DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
        fi

-       msgninfo "Build package ${CCMD}${NAME}=${VERSION}/${RELEASE}${CINFO}… "

        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source
        cd ${BUILDDIR}
        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source
        cd ${BUILDDIR}


@@ -174,17 +177,47 @@ Architecture: $ARCH" > debian/control
        test -e debian/compat || echo "7" > debian/compat
        test -e debian/source/format || echo "3.0 (native)" > debian/source/format
        test -e debian/rules || cp /usr/share/doc/debhelper/examples/rules.tiny debian/rules
        test -e debian/compat || echo "7" > debian/compat
        test -e debian/source/format || echo "3.0 (native)" > debian/source/format
        test -e debian/rules || cp /usr/share/doc/debhelper/examples/rules.tiny debian/rules

+       cd - > /dev/null
+}
+
+buildsimplenativepackage() {
+       local NAME="$1"
+       local ARCH="$2"
+       local VERSION="$3"
+       local RELEASE="${4:-unstable}"
+       local DEPENDENCIES="$5"
+       local DESCRIPTION="$6"
+       local SECTION="${7:-others}"
+       local DISTSECTION
+       if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
+               DISTSECTION="main"
+       else
+               DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
+       fi
+       setupsimplenativepackage "$NAME" "$ARCH" "$VERSION" "$RELEASE" "$DEPENDENCIES" "$DESCRIPTION" "$SECTION"
+       buildpackage "incoming/${NAME}-${VERSION}" "$RELEASE" "$DISTSECTION"
+       rm -rf "incoming/${NAME}-${VERSION}"
+}
+
+buildpackage() {
+       local BUILDDIR=$1
+       local RELEASE=$2
+       local SECTION=$3
+       msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
+       cd $BUILDDIR
+       if [ "$ARCH" = "all" ]; then
+               ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
+       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._-]*$')"
        cd - > /dev/null
        for PKG in $PKGS; do
        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._-]*$')"
        cd - > /dev/null
        for PKG in $PKGS; do

-               echo "pool/${PKG}" >> ./incoming/${RELEASE}.${DISTSECTION}.pkglist
+               echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist

        done
        for SRC in $SRCS; do
        done
        for SRC in $SRCS; do

-               echo "pool/${SRC}" >> ./incoming/${RELEASE}.${DISTSECTION}.srclist
+               echo "pool/${SRC}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.srclist

        done
        done

-       rm -rf $BUILDDIR

        msgdone "info"
 }
 
        msgdone "info"
 }
 


@@ -198,6 +231,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


@@ -344,17 +381,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


@@ -365,12 +429,23 @@ diff() {
        fi
 }
 
        fi
 }
 

+testfileequal() {
+       local FILE="$1"
+       shift
+       msgtest "Test for correctness of file" "$FILE"
+       if [ -z "$*" ]; then
+               echo -n "" | checkdiff $FILE - && msgpass || msgfail
+       else
+               echo "$*" | checkdiff $FILE - && msgpass || msgfail
+       fi
+}
+

 testequal() {
        local COMPAREFILE=$(mktemp)
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
 testequal() {
        local COMPAREFILE=$(mktemp)
        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
 }
 


@@ -383,10 +458,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
 }


@@ -408,7 +483,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 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail

        rm $COMPAREFILE
 }
 
        rm $COMPAREFILE
 }