diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-03-12 18:20:22 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-03-12 18:20:22 +0000 |
| commit | 1b9359cdda7c4bc33c4f526218f86634e2602e2d (patch) | |
| tree | 4f8976929b79a6d6b63a9e1675cdd0f1e3021e41 /test/integration | |
| parent | e7a777ce61efa97f90595be418d757a83483002b (diff) | |
| parent | 460753f991ca42c3c4a5ed494038db76c55e2a08 (diff) | |
Merge branch 'solver3' into 'main'
solver3: Fix Recommends/Suggests vs Enhances confusion
See merge request apt-team/apt!461
Diffstat (limited to 'test/integration')
4 files changed, 27 insertions, 2 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index 4a4e1532b..0e2005d60 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -3,6 +3,5 @@ test-apt-get-upgrade-by-source # TBD: Upgrading by test-apt-install-order-matters-a-bit # Wontfix: Cannot fix, the order is not recorded in the depcache test-bug-470115-new-and-tighten-recommends # TBD: Calculation of what is already satisfied Recommends is broken test-prevent-markinstall-multiarch-same-versionscrew # TBD: We consider the skewed ones obsolete and remove them... -test-resolve-by-keep-new-recommends # TBD: Fixing this seems to break test-bug-591882-conkeror, why? test-resolve-by-keep-obsolete-removals # TBD: ResolveByKeep() usage is badly aligned here test-ubuntu-bug-1304403-obsolete-priority-standard # TBD: Solver3 here happily removes 10 deps to upgrade a package diff --git a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy index 98479b5fd..b3f11956b 100755 --- a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy +++ b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy @@ -1,4 +1,4 @@ -t-bug-598669-install-postfix-gets-exim-heavy!/bin/sh +#!/bin/sh set -e TESTDIR="$(readlink -f "$(dirname "$0")")" diff --git a/test/integration/test-resolve-by-keep-new-recommends b/test/integration/test-resolve-by-keep-new-recommends index 3591ed84d..16acbe0ce 100755 --- a/test/integration/test-resolve-by-keep-new-recommends +++ b/test/integration/test-resolve-by-keep-new-recommends @@ -19,3 +19,21 @@ The following packages have been kept back: 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." testsuccessequal "$UPGRADE_KEEP" aptget upgrade -s +UPGRADE_KEEP="Reading package lists... +Building dependency tree... +Calculating upgrade... +The following packages have been kept back: + foo +0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." +testsuccessequal "$UPGRADE_KEEP" apt upgrade -s + +UPGRADE_KEEP="Reading package lists... +Building dependency tree... +Calculating upgrade... +The following packages will be upgraded: + foo +1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +Inst foo [1.0] (2.0 unstable [i386]) +Conf foo (2.0 unstable [i386])" +testsuccessequal "$UPGRADE_KEEP" aptget dist-upgrade -s + diff --git a/test/integration/test-solver-recommends-depends b/test/integration/test-solver-recommends-depends index 90c5050a7..4b2f91254 100755 --- a/test/integration/test-solver-recommends-depends +++ b/test/integration/test-solver-recommends-depends @@ -13,9 +13,17 @@ insertpackage 'unstable' 'x' 'all' '3' 'Depends: xx Recommends: b' insertpackage 'unstable' 'xx' 'all' '3' 'Depends: a | b Recommends: b' +insertpackage 'installed,unstable' 'recommends-and-enhances' 'all' '3' 'Recommends: b +Enhances:b' setupaptarchive +msgmsg "Test that the Enhances does not confuse the Recommends algorithm" +testsuccessequal "Reading package lists... +Building dependency tree... +Calculating upgrade... +0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." apt full-upgrade -s + msgmsg "Test that the Recommends does not influence the Depends" testsuccessequal "The following additional packages will be installed: a b |