allow explicit dis/enable of IndexTargets in sources options

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 059cba9fb54ffd6d2b5a2e9b100c62be31be7bf2..03f1be114d1e83dba0b397ad867f5e80dcec4162 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -99,10 +99,14 @@ msgdone() {
 }
 getaptconfig() {
        if [ -f ./aptconfig.conf ]; then
 }
 getaptconfig() {
        if [ -f ./aptconfig.conf ]; then

-            echo "./aptconfig.conf"
+               echo "$(readlink -f ./aptconfig.conf)"

        elif [ -f ../aptconfig.conf ]; then
        elif [ -f ../aptconfig.conf ]; then

-            echo "../aptconfig.conf"
-        fi
+               echo "$(readlink -f ../aptconfig.conf)"
+       elif [ -f ../../aptconfig.conf ]; then
+               echo "$(readlink -f ../../aptconfig.conf)"
+       elif [ -f "${TMPWORKINGDIRECTORY}/aptconfig.conf" ]; then
+               echo "$(readlink -f "${TMPWORKINGDIRECTORY}/aptconfig.conf")"
+       fi

 }
 runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "
 }
 runapt() {
        msgdebug "Executing: ${CCMD}$*${CDEBUG} "


@@ -141,6 +145,8 @@ gdb() {
        case "$1" in
        aptget) CMD="apt-get";;
        aptcache) CMD="apt-cache";;
        case "$1" in
        aptget) CMD="apt-get";;
        aptcache) CMD="apt-cache";;

+       aptcdrom) CMD="apt-cdrom";;
+       aptconfig) CMD="apt-config";;

        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;


@@ -564,10 +570,12 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
 
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
        echo "Source: $NAME
 
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
        echo "Source: $NAME

-Section: $SECTION

 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
 Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control
 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
 Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control

+       if [ "$SECTION" != '<none>' ]; then
+               echo "Section: $SECTION" >> ${BUILDDIR}/debian/control
+       fi

        local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
        test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control
        echo "
        local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
        test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control
        echo "


@@ -786,6 +794,7 @@ insertsource() {
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"
        local ARCH="$3"
        local VERSION="$4"
        local DEPENDENCIES="$5"

+        local BINARY="${6:-$NAME}"

        local ARCHS=""
        local SPATH="aptarchive/dists/${RELEASE}/main/source"
        mkdir -p $SPATH
        local ARCHS=""
        local SPATH="aptarchive/dists/${RELEASE}/main/source"
        mkdir -p $SPATH


@@ -793,7 +802,7 @@ insertsource() {
        local DSCFILE="${NAME}_${VERSION}.dsc"
        local TARFILE="${NAME}_${VERSION}.tar.gz"
        echo "Package: $NAME
        local DSCFILE="${NAME}_${VERSION}.dsc"
        local TARFILE="${NAME}_${VERSION}.tar.gz"
        echo "Package: $NAME

-Binary: $NAME
+Binary: $BINARY

 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE
 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE


@@ -1187,9 +1196,16 @@ checkdiff() {
 }
 
 testfileequal() {
 }
 
 testfileequal() {

+       local MSG='Test for correctness of file'
+       if [ "$1" = '--nomsg' ]; then
+               MSG=''
+               shift
+       fi

        local FILE="$1"
        shift
        local FILE="$1"
        shift

-       msgtest "Test for correctness of file" "$FILE"
+       if [ -n "$MSG" ]; then
+               msgtest "$MSG" "$FILE"
+       fi

        if [ -z "$*" ]; then
                echo -n "" | checkdiff - $FILE && msgpass || msgfail
        else
        if [ -z "$*" ]; then
                echo -n "" | checkdiff - $FILE && msgpass || msgfail
        else


@@ -1290,7 +1306,7 @@ testdpkgstatus() {
        local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)"
        if [ "$PKGS" != $NR ]; then
                echo >&2 $PKGS
        local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)"
        if [ "$PKGS" != $NR ]; then
                echo >&2 $PKGS

-               dpkg -l "$@" | grep '^[a-z]' >&2
+               dpkg -l "$@" | grep '^[a-z]' >&2 || true

                msgfail
        else
                msgpass
                msgfail
        else
                msgpass


@@ -1316,6 +1332,17 @@ testmarkedauto() {
        fi
        aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
        fi
        aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }

+testmarkedmanual() {
+       local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedmanual.comparefile"
+       if [ -n "$1" ]; then
+               msgtest 'Test for correctly marked as manually installed' "$*"
+               while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+       else
+               msgtest 'Test for correctly marked as manually installed' 'no package'
+               echo -n > $COMPAREFILE
+       fi
+       aptmark showmanual 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+}

 
 msgfailoutput() {
        local MSG="$1"
 
 msgfailoutput() {
        local MSG="$1"


@@ -1358,8 +1385,17 @@ testsuccess() {
                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"

-                       elif grep -q -E '^[WE]: ' "$OUTPUT"; then
-                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                       elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
+                               if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
+                                       if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
+                                               | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then
+                                               msgpass
+                                       else
+                                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                                       fi
+                               else
+                                       msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                               fi

                        else
                                msgpass
                        fi
                        else
                                msgpass
                        fi


@@ -1414,14 +1450,23 @@ testfailure() {
        else
                local EXITCODE=$?
                if expr match "$1" '^apt.*' >/dev/null; then
        else
                local EXITCODE=$?
                if expr match "$1" '^apt.*' >/dev/null; then

-                       if grep -q -E ' runtime error: ' "$OUTPUT"; then
-                               msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
-                       elif grep -q -E '==ERROR' "$OUTPUT"; then
-                               msgfailoutput 'compiler sanitizers reported errors' "$OUTPUT" "$@"
-                       elif ! grep -q -E '^E: ' "$OUTPUT"; then
-                               msgfailoutput "run failed with exitcode ${EXITCODE}, but with no errors" "$OUTPUT" "$@"
+                       if [ "$1" = 'aptkey' ]; then
+                               if grep -q -E " Can't check signature: " "$OUTPUT" || \
+                                       grep -q -E " BAD signature from " "$OUTPUT"; then
+                                       msgpass
+                               else
+                                       msgfailoutput "run failed with exitcode ${EXITCODE}, but no signature error" "$OUTPUT" "$@"
+                               fi

                        else
                        else

-                               msgpass
+                               if grep -q -E ' runtime error: ' "$OUTPUT"; then
+                                       msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
+                               elif grep -q -E '==ERROR' "$OUTPUT"; then
+                                       msgfailoutput 'compiler sanitizers reported errors' "$OUTPUT" "$@"
+                               elif ! grep -q -E '^E: ' "$OUTPUT"; then
+                                       msgfailoutput "run failed with exitcode ${EXITCODE}, but with no errors" "$OUTPUT" "$@"
+                               else
+                                       msgpass
+                               fi

                        fi
                else
                        msgpass
                        fi
                else
                        msgpass


@@ -1517,7 +1562,7 @@ listcurrentlistsdirectory() {
        } | sort
 }
 
        } | sort
 }
 

-### convinience hacks ###
+### convenience hacks ###

 mkdir() {
        # creating some directories by hand is a tedious task, so make it look simple
        if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
 mkdir() {
        # creating some directories by hand is a tedious task, so make it look simple
        if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||