diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-03-13 21:30:59 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-03-13 21:30:59 +0000 |
| commit | db5267cc17b3b2e6ded25da60adc030124950ae4 (patch) | |
| tree | 181d99da8c0dbde0304ca57bd072143bbb97ef56 /test | |
| parent | 1bc3055b737f2e9732a009026f4fe2a322ef7607 (diff) | |
| parent | 8ae73d1e037a6b9cb258b1ca505abce5681d9931 (diff) | |
Merge branch 'solver3' into 'main'
solver3: Only hide ver->pkg clauses, not pkg->ver version selection ones
See merge request apt-team/apt!462
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-bug-612557-garbage-upgrade | 5 | ||||
| -rwxr-xr-x | test/integration/test-solver3-show-version-selection | 28 |
2 files changed, 31 insertions, 2 deletions
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade index a001c4385..00bc9ac2d 100755 --- a/test/integration/test-bug-612557-garbage-upgrade +++ b/test/integration/test-bug-612557-garbage-upgrade @@ -23,9 +23,10 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis 1. python-uno:i386=1:3.3.0-2 is selected as an upgrade 2. python-uno:i386=1:3.3.0-2 Depends libreoffice-common 3. libreoffice-common:i386 Conflicts openoffice.org-common - 2. openoffice.org-common:i386 is selected for install because: + 2. openoffice.org-common:i386=1:3.2.1-11+squeeze2 is selected for install because: 1. openoffice.org-emailmerge:i386 is selected for install - 2. openoffice.org-emailmerge:i386 PreDepends openoffice.org-common" aptget --trivial-only install python-uno --solver 3.0 + 2. openoffice.org-emailmerge:i386 PreDepends openoffice.org-common + 3. openoffice.org-common:i386 is available in version 1:3.2.1-11+squeeze2" aptget --trivial-only install python-uno --solver 3.0 testfailureequal 'Reading package lists... Building dependency tree... Reading state information... diff --git a/test/integration/test-solver3-show-version-selection b/test/integration/test-solver3-show-version-selection new file mode 100755 index 000000000..c4d23eccf --- /dev/null +++ b/test/integration/test-solver3-show-version-selection @@ -0,0 +1,28 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" +setupenvironment +configarchitecture 'amd64' 's390x' + +insertpackage 'unstable' 'sbuild-build-depends-main-dummy' 's390x' '0.invalid.0' 'Depends: libgstreamer1.0-dev' +insertpackage 'unstable' 'libgstreamer1.0-dev' 's390x' '1.25.90-2' 'Depends: libc6 (>= 2.34)' +insertpackage 'unstable' 'libc6' 's390x' '14.2.0-17' 'Depends: libgcc-s1' +insertpackage 'unstable' 'libgcc-s1' 's390x' '14.2.0-17' 'Multi-Arch: same' +insertpackage 'installed,unstable' 'libgcc-s1' 'amd64' '14.2.0-18' 'Multi-Arch: same' + +setupaptarchive + +testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decisions: + 1. libc6:s390x is selected for install because: + 1. sbuild-build-depends-main-dummy:s390x=0.invalid.0 is selected for install + 2. sbuild-build-depends-main-dummy:s390x Depends libgstreamer1.0-dev:s390x + 3. libgstreamer1.0-dev:s390x Depends libc6:s390x (>= 2.34) + 2. libc6:s390x Depends libgcc-s1:s390x + but none of the choices are installable: + - libgcc-s1:s390x is not selected for install because: + 1. libgcc-s1:amd64 is selected for install + 2. libgcc-s1:amd64 is available in version 14.2.0-18 + 3. libgcc-s1:s390x Breaks libgcc-s1 (!= 14.2.0-17)" apt install sbuild-build-depends-main-dummy --solver 3.0 + |