diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2025-02-11 12:11:20 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2025-02-14 19:08:45 +0100 |
| commit | 4c48b5618ba15d4e33625cec81843891910e81a2 (patch) | |
| tree | 5842b632b56cae8debd582c9a9870feeee4d2f57 /test | |
| parent | 9b8aaaa7abbf36d937dbf7160caa2d9c7c92871f (diff) | |
solver3: Defer 3.0 'deep' autoremoval to 3.1, fix autoremove
Restore the depcache's MarkRequired logic for 3.0 solver; and
change the MarkInstall() call to pass a more correct value for
FromUser, to not override an existing automatic status.
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/solver3.broken | 5 | ||||
| -rwxr-xr-x | test/integration/test-apt-get-autoremove-real-virtual-provider | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index 2212c34ae..540bfbca1 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -1,23 +1,18 @@ test-allow-scores-for-all-dependency-types -test-apt-get-autoremove -test-apt-get-autoremove-kernel-module-providers test-apt-get-upgrade-by-source test-apt-install-file-reltag test-apt-install-order-matters-a-bit test-apt-move-and-forget-manual-sections -test-apt-patterns test-bug-470115-new-and-tighten-recommends test-bug-602412-dequote-redirect test-bug-611729-mark-as-manual test-bug-675449-essential-are-protected test-bug-745046-candidate-propagation-fails -test-bug-753297-upgradable test-bug-767891-force-essential-important test-bug-961266-hold-means-hold test-dont-forget-conflicts-via-unknown-architectures test-explore-or-groups-in-markinstall test-external-dependency-solver-protocol -test-method-mirror test-parse-all-archs-into-cache test-phased-updates-new-depends test-phased-updates-upgrade diff --git a/test/integration/test-apt-get-autoremove-real-virtual-provider b/test/integration/test-apt-get-autoremove-real-virtual-provider index d5438f8b3..7fda4d370 100755 --- a/test/integration/test-apt-get-autoremove-real-virtual-provider +++ b/test/integration/test-apt-get-autoremove-real-virtual-provider @@ -31,7 +31,7 @@ The following packages will be REMOVED: needs-provider1 needs-provider4 0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded. Remv needs-provider1 [1] -Remv needs-provider4 [1]' aptget autoremove -s --solver 3.0 +Remv needs-provider4 [1]' aptget autoremove -s --solver 3.1 testsuccessequal 'Reading package lists... Building dependency tree... @@ -39,4 +39,4 @@ Reading state information... The following packages will be REMOVED: needs-provider4 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded. -Remv needs-provider4 [1]' aptget autoremove -s --solver internal +Remv needs-provider4 [1]' aptget autoremove -s |