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-explore-or-groups-in-markinstall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/integration/test-explore-or-groups-in-markinstall') 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... -- cgit v1.2.3-70-g09d2