diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-11-02 12:45:07 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-12-03 09:44:18 +0100 |
| commit | 8f317d97c9fb821e839342ae445c824207678eb7 (patch) | |
| tree | 17404bfe4fd59c7ee6c18b19e0ade8f42221ff68 /test | |
| parent | 3e5977ed7b4e6291fcd67df193a501754ec1de7f (diff) | |
solver3: Reject all non-candidates outright for strict pinning
Reimplement strict pinning by rejecting the non-candidates when
translating the problem from the depcache to the solver. This is
substantially better than restricting the list of alternatives for
an or group to only include allowed ones for debugging purposes,
albeit a bit slower.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-handling-broken-orgroups | 2 | ||||
| -rwxr-xr-x | test/integration/test-solver3-obsoleted-by | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups index 1c20ae4f1..50b158752 100755 --- a/test/integration/test-handling-broken-orgroups +++ b/test/integration/test-handling-broken-orgroups @@ -95,7 +95,7 @@ Inst coolstuff-provided (1.0-1 unstable [all]) Conf extrastuff (1.0-1 unstable [all]) Conf coolstuff-provided (1.0-1 unstable [all])' aptget install coolstuff-provided -s -testfailuremsg 'E: Unsatisfiable dependency group coolstuff-provided-broken:i386=1.0-1 -> cool2:i386' aptget install coolstuff-provided-broken --solver 3.0 -s +testfailuremsg 'E: Conflict: coolstuff-provided-broken:i386=1.0-1 -> extrastuff:i386=1.0-1 but not extrastuff:i386=1.0-1' aptget install coolstuff-provided-broken --solver 3.0 -s testfailureequal 'Reading package lists... Building dependency tree... Some packages could not be installed. This may mean that you have diff --git a/test/integration/test-solver3-obsoleted-by b/test/integration/test-solver3-obsoleted-by index 031589bb4..486c55c58 100755 --- a/test/integration/test-solver3-obsoleted-by +++ b/test/integration/test-solver3-obsoleted-by @@ -66,9 +66,12 @@ testobsolete "Obsolete: not-yet-built:amd64 - not installable Obsolete: good:amd64 - not installable Obsolete: obsolete:amd64 - not installable Obsolete: obsolete-in-experimental:amd64 - not installable -Obsolete: current-version:amd64 - not installable +Obsolete: obsolete-reason:amd64 - not installable Obsolete: local-only:amd64 - not installable -Obsolete: obsolete-in-downgrade:amd64 - not installable" aptget dist-upgrade +Obsolete: obsolete-in-experimental-reason:amd64 - not installable +Obsolete: current-version:amd64 - not installable +Obsolete: obsolete-in-downgrade:amd64 - not installable +Obsolete: obsolete-in-downgrade-reason:amd64 - not installable" aptget dist-upgrade testobsolete "Obsolete: obsolete:amd64=1 due to obsolete-reason:amd64=2 Obsolete: obsolete-in-experimental:amd64=1 due to obsolete-in-experimental-reason:amd64=2 |