merged from debian-sid

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index ee4048a532306e17159eb0f62cfe5eeb018db3c7..cc5af798c9b38448bba008ec9f85ac47ee1a1b84 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -79,6 +79,7 @@ aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }

+aptmark() { runapt apt-mark $*; }

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


@@ -144,6 +145,7 @@ setupenvironment() {
        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

+       export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"

        msgdone "info"
 }
 
        msgdone "info"
 }
 


@@ -217,6 +219,7 @@ buildsimplenativepackage() {
        local DEPENDENCIES="$5"
        local DESCRIPTION="$6"
        local SECTION="${7:-others}"
        local DEPENDENCIES="$5"
        local DESCRIPTION="$6"
        local SECTION="${7:-others}"

+       local PRIORITY="${8:-optional}"

        local DISTSECTION
        if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
                DISTSECTION="main"
        local DISTSECTION
        if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
                DISTSECTION="main"


@@ -239,7 +242,7 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
        echo "Source: $NAME
 Section: $SECTION
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
        echo "Source: $NAME
 Section: $SECTION

-Priority: optional
+Priority: $PRIORITY

 Maintainer: Joe Sixpack <joe@example.org>
 Standards-Version: 3.9.1
 
 Maintainer: Joe Sixpack <joe@example.org>
 Standards-Version: 3.9.1
 


@@ -260,18 +263,25 @@ Package: $NAME" > ${BUILDDIR}/debian/control
        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._+~-]*$')"
        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._+~-]*$')"

-
-       mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
-       cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
-       cp ${BUILDDIR}/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
-       (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$ARCH)
-       (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
-
-       dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. > /dev/null
-       echo "pool/${NAME}_${VERSION}_${ARCH}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist

        for SRC in $SRCS; do
                echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
        done
        for SRC in $SRCS; do
                echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
        done

+
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+               rm -rf ${BUILDDIR}/debian/tmp
+               mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
+               cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
+               cp ${BUILDDIR}/${NAME} ${BUILDDIR}/debian/tmp/usr/bin/${NAME}-${arch}
+               (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch)
+               (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
+
+               dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. 2> /dev/null > /dev/null
+               echo "pool/${NAME}_${VERSION}_${arch}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
+       done
+
+       mkdir -p ${BUILDDIR}/../${NAME}_${VERSION}
+       cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}/
+       cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}.changelog

        rm -rf "${BUILDDIR}"
        msgdone "info"
 }
        rm -rf "${BUILDDIR}"
        msgdone "info"
 }


@@ -324,10 +334,10 @@ createaptftparchiveconfig() {
        echo -n '";
 };
 Default {
        echo -n '";
 };
 Default {

-       Packages::Compress ". gzip bzip2 lzma";
-       Sources::Compress ". gzip bzip2 lzma";
-       Contents::Compress ". gzip bzip2 lzma";
-       Translation::Compress ". gzip bzip2 lzma";
+       Packages::Compress ". gzip bzip2 lzma xz";
+       Sources::Compress ". gzip bzip2 lzma xz";
+       Contents::Compress ". gzip bzip2 lzma xz";
+       Translation::Compress ". gzip bzip2 lzma xz";

        LongDescription "false";
 };
 TreeDefault {
        LongDescription "false";
 };
 TreeDefault {


@@ -388,25 +398,55 @@ insertpackage() {
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"

-       local ARCHS="$ARCH"
-       if [ "$ARCHS" = "all" ]; then
-               ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
-       fi
-       for BUILDARCH in $ARCHS; do
-               local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"
-               mkdir -p $PPATH aptarchive/dists/${RELEASE}/main/source
-               touch aptarchive/dists/${RELEASE}/main/source/Sources
-               local FILE="${PPATH}/Packages"
-               echo "Package: $NAME
-Priority: optional
+       local PRIORITY="${6:-optional}"
+       local ARCHS=""
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+               if [ "$arch" = "all" ]; then
+                       ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+               else
+                       ARCHS="$arch"
+               fi
+               for BUILDARCH in $ARCHS; do
+                       local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"
+                       mkdir -p $PPATH aptarchive/dists/${RELEASE}/main/source
+                       touch aptarchive/dists/${RELEASE}/main/source/Sources
+                       local FILE="${PPATH}/Packages"
+                       echo "Package: $NAME
+Priority: $PRIORITY

 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>

-Architecture: $ARCH
+Architecture: $arch

 Version: $VERSION
 Version: $VERSION

-Filename: pool/main/${NAME}/${NAME}_${VERSION}_${ARCH}.deb" >> $FILE
+Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
+                       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
+                       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…
+" >> $FILE
+               done
+       done
+}
+
+insertinstalledpackage() {
+       local NAME="$1"
+       local ARCH="$2"
+       local VERSION="$3"
+       local DEPENDENCIES="$4"
+       local PRIORITY="${5:-optional}"
+       local FILE="rootdir/var/lib/dpkg/status"
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+               echo "Package: $NAME
+Status: install ok installed
+Priority: $PRIORITY
+Section: other
+Installed-Size: 42
+Maintainer: Joe Sixpack <joe@example.org>
+Architecture: $arch
+Version: $VERSION" >> $FILE

                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE

-               echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+               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…
  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…


@@ -414,6 +454,7 @@ Filename: pool/main/${NAME}/${NAME}_${VERSION}_${ARCH}.deb" >> $FILE
        done
 }
 
        done
 }
 

+

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


@@ -434,6 +475,7 @@ buildaptarchivefromfiles() {
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                cat ${line} | lzma > ${line}.lzma
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                cat ${line} | lzma > ${line}.lzma

+               cat ${line} | xz > ${line}.xz

                msgdone "info"
        done
        generatereleasefiles
                msgdone "info"
        done
        generatereleasefiles


@@ -531,13 +573,22 @@ changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"

-               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
+       elif which lighttpd > /dev/null; then
+               echo "server.document-root = \"$(readlink -f ./aptarchive)\"
+server.port = 8080
+server.stat-cache-engine = \"disable\"" > lighttpd.conf
+               lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
+               lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
+               addtrap "kill $!;"
+       else
+               msgdie 'You have to install weborf or lighttpd first'
+               return 1

        fi
        fi

-       return 1
+       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

 }
 
 checkdiff() {
 }
 
 checkdiff() {


@@ -589,12 +640,12 @@ testequalor2() {
 }
 
 testshowvirtual() {
 }
 
 testshowvirtual() {

-       local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual"
+       local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"

        local PACKAGE="$1"
        shift
        while [ -n "$1" ]; do
                VIRTUAL="${VIRTUAL}
        local PACKAGE="$1"
        shift
        while [ -n "$1" ]; do
                VIRTUAL="${VIRTUAL}

-N: Can't select versions from package '$1' as it purely virtual"
+N: Can't select versions from package '$1' as it is purely virtual"

                PACKAGE="${PACKAGE} $1"
                shift
        done
                PACKAGE="${PACKAGE} $1"
                shift
        done


@@ -623,8 +674,8 @@ 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 '^[a-z]' | grep '^[^i]' | wc -l)"
-       if [ "$PKGS" != 0 ]; then
+       local PKGS="$(dpkg -l $* | grep '^i' | wc -l)"
+       if [ "$PKGS" != $# ]; then

                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
                msgfail
                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
                msgfail


@@ -633,9 +684,9 @@ testdpkginstalled() {
        msgpass
 }
 
        msgpass
 }
 

-testdpkgnoninstalled() {
-       msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
-       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+testdpkgnotinstalled() {
+       msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* 2> /dev/null | grep '^i' | wc -l)"

        if [ "$PKGS" != 0 ]; then
                echo
                dpkg -l $* | grep '^[a-z]'
        if [ "$PKGS" != 0 ]; then
                echo
                dpkg -l $* | grep '^[a-z]'


@@ -644,3 +695,16 @@ testdpkgnoninstalled() {
        fi
        msgpass
 }
        fi
        msgpass
 }

+
+testmarkedauto() {
+       local COMPAREFILE=$(mktemp)
+       addtrap "rm $COMPAREFILE;"
+       if [ -n "$1" ]; then
+               msgtest 'Test for correctly marked as auto-installed' "$*"
+               while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+       else
+               msgtest 'Test for correctly marked as auto-installed' 'no package'
+               echo -n > $COMPAREFILE
+       fi
+       aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+}