always send content-length via the new addDataHeaders() to ensure w3m/curl are happy...

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 350ee112ea3682aa958ef5272bef4584b36a135d..bf46ae0c56eb397d0c68bc0195bf735c7a0b94dd 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -29,7 +29,8 @@ 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;
 }
        done
        echo -n "…${CNORMAL} " >&2;
 }


@@ -106,6 +107,10 @@ 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
+}

 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"
 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"


@@ -150,7 +155,7 @@ 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

-       if ! $(which dpkg) --assert-multi-arch; then
+       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 "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


@@ -198,7 +203,7 @@ configdpkg() {
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi

-       if $(which dpkg) --assert-multi-arch; then
+       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)"
                local ARCHS="$(getarchitectures)"
                if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
                        DPKGARCH="$(dpkg --print-architecture)"


@@ -206,7 +211,9 @@ configdpkg() {
                                if [ "${ARCH}" != "${DPKGARCH}" ]; then dpkg --add-architecture ${ARCH}; fi
                        done
                        if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
                                if [ "${ARCH}" != "${DPKGARCH}" ]; then dpkg --add-architecture ${ARCH}; fi
                        done
                        if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then

-                               insertinstalledpackage 'dpkg' "all" '1.16.2~wipmultiarch~fake'
+                               # 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
                        fi
                fi
        fi


@@ -297,23 +304,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


@@ -501,7 +513,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() {


@@ -555,7 +568,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


@@ -572,9 +585,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)"


@@ -677,8 +687,20 @@ signreleasefiles() {
        msgdone "info"
 }
 
        msgdone "info"
 }
 

+simulatebrokenwebserver() {
+       if ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+                 msgdie 'Need the aptwebserver to simulate broken connections'
+        fi
+        changetowebserver '--simulate-paywall'
+}
+

 changetowebserver() {
 changetowebserver() {

-       if which weborf > /dev/null; then
+       if test -x ${BUILDDIRECTORY}/aptwebserver; then
+               cd aptarchive
+               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null &
+               addtrap "kill $!;"
+               cd - > /dev/null
+       elif which weborf > /dev/null; then

                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
        elif which gatling > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
        elif which gatling > /dev/null; then