From 33190fe3d3c200dcd417cd336f9db11f5f4408d5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 10 May 2016 14:51:30 +0200 Subject: don't sent uninstallable rc-only versions via EDSP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Versions which are only available in dpkg/status aren't installable and apt doesn't pick them as candidate for this reason – for the same reason such packages shouldn't be sent to an external solver via EDSP. The packages are pinned to -1, but if the solver has strict pinning disabled it could end up picking this version anyhow – which is a request apt can not satisfy. Reported-By: Maximiliano Curia on IRC --- .../test-ubuntu-bug-761175-remove-purge | 73 +++++++++++++++------- 1 file changed, 50 insertions(+), 23 deletions(-) (limited to 'test') diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge index 00f289b53..aae394ad8 100755 --- a/test/integration/test-ubuntu-bug-761175-remove-purge +++ b/test/integration/test-ubuntu-bug-761175-remove-purge @@ -23,35 +23,62 @@ buildcompizpkg 'all' 'all' '2.0' 'unstable' setupaptarchive runtests() { - testdpkgnotinstalled compiz-core-$1 - testsuccess aptget install compiz-core-$1 -t "${2:-unstable}" - testdpkginstalled compiz-core-$1 + local PKG="$1" + local RELEASE="${2}" + shift 2 + testdpkgnotinstalled compiz-core-${PKG} + testsuccess aptget install compiz-core-${PKG} -t "${RELEASE}" "$@" + testdpkginstalled compiz-core-${PKG} - testsuccess aptget remove compiz-core-$1 -y - testdpkgnotinstalled compiz-core-$1 - testdpkgstatus 'rc' '1' "compiz-core-$1" + testsuccess aptget remove compiz-core-${PKG} -y "$@" + testdpkgnotinstalled compiz-core-${PKG} + testdpkgstatus 'rc' '1' "compiz-core-${PKG}" - testsuccessequal "Reading package lists... + if [ -z "$1" ]; then + testsuccessequal "Reading package lists... Building dependency tree... Reading state information... The following packages will be REMOVED: - compiz-core-$1* + compiz-core-${PKG}* 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. -Purg compiz-core-$1" aptget purge compiz-core-$1 -s - testsuccess aptget purge compiz-core-$1 -y +Purg compiz-core-${PKG}" aptget purge compiz-core-${PKG} -s "$@" + else + # check that the rc-version isn't passed to the external resolver if its only in dpkg/status + export APT_EDSP_DUMP_FILENAME="${TMPWORKINGDIRECTORY}/dump-${PKG}.edsp" + testfailure aptget purge compiz-core-${PKG} -y "$@" -s --solver dump + testsuccessequal '2' grep -c "^Package: compiz-core-${PKG}\$" "$APT_EDSP_DUMP_FILENAME" + mv rootdir/etc/apt/sources.list.d/apt-test-stable-deb.list rootdir/etc/apt/sources.list.d/apt-test-stable-deb.disabled + testfailure aptget purge compiz-core-${PKG} -y "$@" -s --solver dump + testsuccessequal '1' grep -c "^Package: compiz-core-${PKG}\$" "$APT_EDSP_DUMP_FILENAME" + mv rootdir/etc/apt/sources.list.d/apt-test-stable-deb.disabled rootdir/etc/apt/sources.list.d/apt-test-stable-deb.list + + testsuccessequal "Reading package lists... +Building dependency tree... +Reading state information... +Execute external solver... +The following packages will be REMOVED: + compiz-core-${PKG}* +0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. +Purg compiz-core-${PKG}" aptget purge compiz-core-${PKG} -s "$@" + fi + testsuccess aptget purge compiz-core-${PKG} -y "$@" echo -n '' > rootdir/var/lib/dpkg/available # dpkg -l < 1.16.2 reads the available file by default, where the package can be found - testequalor2 "dpkg-query: no packages found matching compiz-core-$1" "No packages found matching compiz-core-$1." dpkg -l compiz-core-$1 + testequalor2 "dpkg-query: no packages found matching compiz-core-${PKG}" "No packages found matching compiz-core-${PKG}." dpkg -l compiz-core-${PKG} +} +runtestround() { + runtests 'native' 'unstable' "$@" + runtests 'all' 'unstable' "$@" + runtests 'native' 'stable' "$@" + runtests 'all' 'stable' "$@" } +testround() { + msgmsg 'Test in multi arch environment' "$@" + configarchitecture 'amd64' 'i386' + runtestround "$@" -msgmsg 'Test in multi arch environment' -runtests 'native' -runtests 'all' -runtests 'native' 'stable' -runtests 'all' 'stable' - -msgmsg 'Test in single arch environment' -configarchitecture 'amd64' -runtests 'native' -runtests 'all' -runtests 'native' 'stable' -runtests 'all' 'stable' + msgmsg 'Test in single arch environment' "$@" + configarchitecture 'amd64' + runtestround "$@" +} +testround +testround --solver apt -- cgit v1.2.3-70-g09d2