From 5e8e69cdd6b512480f3208298725e1e44c80f06e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 26 Oct 2025 08:24:39 +0100 Subject: Adjust test cases to treat 3.0 as default APT_SOLVER if not set Not needed so far because we export a default 3.0 APT_SOLVER, but quite useful if we stop doing so (next commit). --- test/integration/test-apt-get-satisfy | 2 +- test/integration/test-apt-get-source-only | 2 +- test/integration/test-apt-get-upgrade | 2 +- test/integration/test-bug-604222-new-and-autoremove | 2 +- test/integration/test-bug-723586-any-stripped-in-single-arch | 2 +- test/integration/test-bug-758153-versioned-provides-support | 2 +- test/integration/test-explore-or-groups-in-markinstall | 6 +++--- test/integration/test-multiarch-allowed | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'test/integration') diff --git a/test/integration/test-apt-get-satisfy b/test/integration/test-apt-get-satisfy index 8e5e06843..8d57a98a8 100755 --- a/test/integration/test-apt-get-satisfy +++ b/test/integration/test-apt-get-satisfy @@ -98,7 +98,7 @@ The following packages have unmet dependencies: satisfy:command-line : Depends: depends (>= 2) but it is not going to be installed E: Unable to correct problems, you have held broken packages." aptget satisfy --simulate "depends (>= 2)" "Conflicts: conflicts:i386 (>= 1) [i386], conflicts:amd64 (>= 1) [amd64]" --solver internal -if [ "$APT_SOLVER" != "3.0" ]; then +if [ "$APT_SOLVER" == "internal" ]; then # FIXME: solver3 doesn't produce nice errors in the external solver scenario testfailureequal "Reading package lists... Building dependency tree... diff --git a/test/integration/test-apt-get-source-only b/test/integration/test-apt-get-source-only index e5d246f6e..91a157b47 100755 --- a/test/integration/test-apt-get-source-only +++ b/test/integration/test-apt-get-source-only @@ -29,7 +29,7 @@ DOWNLOADNOTFOO="Need to get 0 B/33 B of source archives. 'file:${APTARCHIVE}/not-foo_1.0.dsc' not-foo_1.0.dsc 15 SHA256:db578a571c87d2555e90245732042845be4f481755f5b2f5786ac7a26bde9f4f 'file:${APTARCHIVE}/not-foo_1.0.tar.gz' not-foo_1.0.tar.gz 18 SHA256:8701846f1cba0ca81c552ac0ec93e2a89ae113cf2872b9cd51b29b4a9ff6b122" -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then BUILDDEPFOO="Reading package lists... Building dependency tree... Some packages could not be installed. This may mean that you have diff --git a/test/integration/test-apt-get-upgrade b/test/integration/test-apt-get-upgrade index 0eaa5a00a..39135cd6b 100755 --- a/test/integration/test-apt-get-upgrade +++ b/test/integration/test-apt-get-upgrade @@ -66,7 +66,7 @@ Inst upgrade-with-new-dep [1.0] (2.0 unstable [all]) Conf new-dep (1.0 stable [all]) Conf upgrade-simple (2.0 unstable [all]) Conf upgrade-with-new-dep (2.0 unstable [all])' -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then # FIXME: It would be better if we would keep back the upgrade rather than switch to sysvinit, # but it's not clear that is reliably possible. UPGRADENEW="Reading package lists... diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove index 70dc4cac3..7a7de1c8d 100755 --- a/test/integration/test-bug-604222-new-and-autoremove +++ b/test/integration/test-bug-604222-new-and-autoremove @@ -93,7 +93,7 @@ E: Trivial Only specified but this is not a trivial operation." aptget install d rm -f rootdir/var/lib/dpkg/status rootdir/var/lib/apt/extended_states -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then CONFLICTING='Reading package lists... Building dependency tree... Solving dependencies...Install dummy-archive:i386 () diff --git a/test/integration/test-bug-723586-any-stripped-in-single-arch b/test/integration/test-bug-723586-any-stripped-in-single-arch index 672413125..191d75647 100755 --- a/test/integration/test-bug-723586-any-stripped-in-single-arch +++ b/test/integration/test-bug-723586-any-stripped-in-single-arch @@ -29,7 +29,7 @@ Inst python3-gnupg (0.3.5-2 stable [all]) Conf python3 (3.3.2-16 unstable [amd64]) Conf python3-gnupg (0.3.5-2 stable [all])' -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then FAILLOG='Reading package lists... Building dependency tree... Solving dependencies... diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support index a057d33a8..4448bf58c 100755 --- a/test/integration/test-bug-758153-versioned-provides-support +++ b/test/integration/test-bug-758153-versioned-provides-support @@ -394,7 +394,7 @@ Inst needsselfprov12 (1 unstable [amd64]) Conf selfprov (2 unstable [amd64]) Conf needsselfprov12 (1 unstable [amd64])" aptget install needsselfprov12 -s --solver $solver if [ "$solver" = 'apt' ]; then -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then TOPDEPENDS=" needsselfprov123 : Depends: selfprov (= 1) Depends: selfprov (= 2) Depends: selfprov (= 3)" diff --git a/test/integration/test-explore-or-groups-in-markinstall b/test/integration/test-explore-or-groups-in-markinstall index 60de59193..77f769e77 100755 --- a/test/integration/test-explore-or-groups-in-markinstall +++ b/test/integration/test-explore-or-groups-in-markinstall @@ -95,7 +95,7 @@ The following NEW packages will be installed: } checkfoos 'd' 'Depends' # FIXME? The 3.0 solver solves Recommends after Depends, so they do not influence our decisions here. -[ "$APT_SOLVER" = "3.0" ] || checkfoos 'r' 'Recommends' +[ "$APT_SOLVER" != "internal" ] || checkfoos 'r' 'Recommends' testsuccessequal 'Reading package lists... Building dependency tree... @@ -129,9 +129,9 @@ if $TEST_WITH_APTITUDE; then Need to get 0 B/84 B of archives. After unpacking 86.0 kB will be used. Would download/install/remove packages.' testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-d-level2 -sy - [ "$APT_SOLVER" = "3.0" ] || testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-r-level2 -sy # FIXME: See above for 3.0 + [ "$APT_SOLVER" != "internal" ] || testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-r-level2 -sy # FIXME: See above for 3.0 testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-d-conflict -sy - [ "$APT_SOLVER" = "3.0" ] || testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-r-conflict -sy # FIXME: See above for 3.0 + [ "$APT_SOLVER" != "internal" ] || testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-r-conflict -sy # FIXME: See above for 3.0 fi BADSOLVETEXT='Reading package lists... diff --git a/test/integration/test-multiarch-allowed b/test/integration/test-multiarch-allowed index ca13cc50d..8c244ed57 100755 --- a/test/integration/test-multiarch-allowed +++ b/test/integration/test-multiarch-allowed @@ -149,7 +149,7 @@ Conf $1 (1 unstable [amd64])" aptget install $1 foo:i386 -s testneedsfooallgood 'needsfooany' testneedsfooallgood 'needsfoover1' -if [ "$APT_SOLVER" = "3.0" ]; then +if [ "$APT_SOLVER" != "internal" ]; then NEEDSFOO2NATIVE="$BADPREFIX The following packages have unmet dependencies: needsfoover2 : Depends: foo:any (>= 2) -- cgit v1.2.3-70-g09d2