test: framework: Ensure copied status files have trailing lines

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 9dce3dc119ebcf0b67a51d1e2a6c3f398ed1aa2b..c5b752e1809fd7f917b1f8e8ab484291126e8a3f 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -5,6 +5,8 @@ EXIT_CODE=0
 while [ -n "$1" ]; do
        if [ "$1" = "-q" ]; then
                export MSGLEVEL=2
 while [ -n "$1" ]; do
        if [ "$1" = "-q" ]; then
                export MSGLEVEL=2

+       elif [ "$1" = "-qq" ]; then
+               export MSGLEVEL=1

        elif [ "$1" = "-v" ]; then
                export MSGLEVEL=4
        elif [ "$1" = '--color=no' ]; then
        elif [ "$1" = "-v" ]; then
                export MSGLEVEL=4
        elif [ "$1" = '--color=no' ]; then


@@ -142,6 +144,9 @@ if [ $MSGLEVEL -le 4 ]; then
        msgdebug() { true; }
        msgndebug() { true; }
 fi
        msgdebug() { true; }
        msgndebug() { true; }
 fi

+if [ $MSGLEVEL -le 1 ]; then
+       msgpass() { true; }
+fi

 msgdone() {
        if [ "$1" = "debug" -a $MSGLEVEL -le 4 ] ||
           [ "$1" = "info" -a $MSGLEVEL -le 3 ] ||
 msgdone() {
        if [ "$1" = "debug" -a $MSGLEVEL -le 4 ] ||
           [ "$1" = "info" -a $MSGLEVEL -le 3 ] ||


@@ -195,6 +200,9 @@ aptinternalplanner() { runapt "${APTINTERNALPLANNER}" "$@"; }
 dpkg() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }
 dpkg() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }

+dpkg_version() {
+       command perl -MDpkg -E 'say $Dpkg::PROGVERSION'
+}

 dpkgcheckbuilddeps() {
        command dpkg-checkbuilddeps --admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" "$@"
 }
 dpkgcheckbuilddeps() {
        command dpkg-checkbuilddeps --admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" "$@"
 }


@@ -311,7 +319,7 @@ setupenvironment() {
                # relax permissions so that running as root with user switching works
                umask 022
                chmod 711 "$TMPWORKINGDIRECTORY"
                # relax permissions so that running as root with user switching works
                umask 022
                chmod 711 "$TMPWORKINGDIRECTORY"

-               chown _apt:root "${TMPWORKINGDIRECTORY}/downloaded"
+               chown _apt:$(id -gn) "${TMPWORKINGDIRECTORY}/downloaded"

        fi
 
        TESTDIRECTORY="$(readlink -f "$(dirname $0)")"
        fi
 
        TESTDIRECTORY="$(readlink -f "$(dirname $0)")"


@@ -433,13 +441,15 @@ EOF
                # in testcases, it can appear as if localhost has a rotation setup,
                # hide this as we can't really deal with it properly
                echo 'Acquire::Failure::ShowIP "false";'
                # in testcases, it can appear as if localhost has a rotation setup,
                # hide this as we can't really deal with it properly
                echo 'Acquire::Failure::ShowIP "false";'

+               # randomess and tests don't play well together
+               echo 'Acquire::IndexTargets::Randomized "false";'

                # fakeroot can't fake everything, so disabled in production but good for tests
                echo 'APT::Sandbox::Verify "true";'
        } >> aptconfig.conf
 
        cp "${TESTDIRECTORY}/apt.pem" "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"
        if [ "$(id -u)" = '0' ]; then
                # fakeroot can't fake everything, so disabled in production but good for tests
                echo 'APT::Sandbox::Verify "true";'
        } >> aptconfig.conf
 
        cp "${TESTDIRECTORY}/apt.pem" "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"
        if [ "$(id -u)" = '0' ]; then

-               chown _apt:root "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"
+               chown _apt:$(id -gn) "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"

        fi
        echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https
        echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
        fi
        echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https
        echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary


@@ -451,11 +461,8 @@ EOF
 
        # create some files in /tmp and look at user/group to get what this means
        TEST_DEFAULT_USER="$(id -un)"
 
        # create some files in /tmp and look at user/group to get what this means
        TEST_DEFAULT_USER="$(id -un)"

-       if [ "$(uname)" = 'GNU/kFreeBSD' ]; then
-               TEST_DEFAULT_GROUP='root'
-       else
-               TEST_DEFAULT_GROUP="$(id -gn)"
-       fi
+       touch "${TMPWORKINGDIRECTORY}/test-file"
+       TEST_DEFAULT_GROUP=$(stat --format '%G'  "${TMPWORKINGDIRECTORY}/test-file")

 
        # cleanup the environment a bit
        # prefer our apt binaries over the system apt binaries
 
        # cleanup the environment a bit
        # prefer our apt binaries over the system apt binaries


@@ -518,6 +525,10 @@ configdpkg() {
                local STATUSFILE="status-${BASENAME#*-}"
                if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
                        cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
                local STATUSFILE="status-${BASENAME#*-}"
                if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
                        cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status

+                       # Add an empty line to the end if there is none
+                       if tail -1 rootdir/var/lib/dpkg/status | grep -q .; then
+                               echo >> rootdir/var/lib/dpkg/status
+                       fi

                else
                        echo -n > rootdir/var/lib/dpkg/status
                fi
                else
                        echo -n > rootdir/var/lib/dpkg/status
                fi


@@ -531,7 +542,7 @@ configdpkg() {
                        insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
                fi
        fi
                        insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
                fi
        fi

-       if command dpkg --assert-multi-arch >/dev/null 2>&1 ; then
+       if dpkg --assert-multi-arch >/dev/null 2>&1 ; then

                local ARCHS="$(getarchitectures)"
                local DPKGARCH="$(dpkg --print-architecture)"
                # this ensures that even if multi-arch isn't active in the view
                local ARCHS="$(getarchitectures)"
                local DPKGARCH="$(dpkg --print-architecture)"
                # this ensures that even if multi-arch isn't active in the view


@@ -806,7 +817,7 @@ buildpackage() {
        if [ "$ARCH" = "all" ]; then
                ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
        fi
        if [ "$ARCH" = "all" ]; then
                ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
        fi

-       testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH
+       testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH -d

        cp "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$BUILDLOG"
        local PKGS="$(grep '^dpkg-deb: building package' "$BUILDLOG" | cut -d'/' -f 2 | sed -e "s#'\.##")"
        local SRCS="$(grep '^dpkg-source: info: building' "$BUILDLOG" | grep -o '[a-z0-9._+~-]*$')"
        cp "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$BUILDLOG"
        local PKGS="$(grep '^dpkg-deb: building package' "$BUILDLOG" | cut -d'/' -f 2 | sed -e "s#'\.##")"
        local SRCS="$(grep '^dpkg-source: info: building' "$BUILDLOG" | grep -o '[a-z0-9._+~-]*$')"


@@ -914,6 +925,7 @@ Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb"
                                        test -z "$DEPENDENCIES" || printf "%b\n" "$DEPENDENCIES"
                                        echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)"
                                        echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)"
                                        test -z "$DEPENDENCIES" || printf "%b\n" "$DEPENDENCIES"
                                        echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)"
                                        echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)"

+                                       echo "SHA256: 0000000000000000000000000000000000000000000000000000000000000000"

                                        echo
                                } >> "${PPATH}/Packages"
                        done
                                        echo
                                } >> "${PPATH}/Packages"
                        done


@@ -1960,7 +1972,7 @@ mkdir() {
                command mkdir -m 700 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"
                touch "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/lock"
                if [ "$(id -u)" = '0' ]; then
                command mkdir -m 700 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"
                touch "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/lock"
                if [ "$(id -u)" = '0' ]; then

-                       chown _apt:root "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"
+                       chown _apt:$(id -gn) "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"

                fi
        else
                command mkdir "$@"
                fi
        else
                command mkdir "$@"


@@ -2032,7 +2044,7 @@ testaptautotestnodpkgwarning() {
                if expr match "$2" '^-dy\?' >/dev/null 2>&1; then return; fi # download-only mode
                shift
        done
                if expr match "$2" '^-dy\?' >/dev/null 2>&1; then return; fi # download-only mode
                shift
        done

-       testfailure grep '^dpkg: warning:.*ignor.*' "${TMPWORKINGDIRECTORY}/rootdir/tmp-before/${TESTCALL}.output"
+       testfailure grep '^dpkg: warning:.*\(ignor\|unknown\).*' "${TMPWORKINGDIRECTORY}/rootdir/tmp-before/${TESTCALL}.output"

 }
 
 aptautotest_aptget_install() { testaptautotestnodpkgwarning "$@"; }
 }
 
 aptautotest_aptget_install() { testaptautotestnodpkgwarning "$@"; }