diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-05-28 12:34:11 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-05-28 12:34:11 +0000 |
| commit | c4cb1e76999247867fc04bdbfa71c8c2c6b26ad1 (patch) | |
| tree | ca4964720d28be2484cf4e962fa42c30a2a770d5 /test | |
| parent | adb67fa7abf9eb30d312fdd3284f9d86a2899cb2 (diff) | |
| parent | 3f8162ea008b8a3330a1113a94bc654f05000660 (diff) | |
Merge branch 'solver3' into 'main'
solver3: Only merge dependencies on the same package
See merge request apt-team/apt!486
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-ubuntu-bug-2111792-intersecting-dependencies | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies index 86866b233..b63991aa4 100755 --- a/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies +++ b/test/integration/test-ubuntu-bug-2111792-intersecting-dependencies @@ -24,6 +24,16 @@ insertpackage 'unstable' 'git-rec-ng' 'amd64,i386' '1:2.26.2-1' 'Recommends: git Depends: git (<< 1:2.26.2-.)' insertpackage 'unstable' 'chaos-actor' 'amd64,i386' '1' 'Provides: git (2:1)' +# Another test case we don't want to merge +insertpackage 'unstable' 'xserver-xorg' 'amd64,i386' '1' 'Depends: xserver-xorg-input-all | xorg-driver-input, xserver-xorg-video-all | xorg-driver-video, xorg-driver-input, xorg-driver-video' +insertpackage 'unstable' 'xserver-xorg-noalt' 'amd64,i386' '1' 'Depends: xorg-driver-input, xorg-driver-video' + + +insertpackage 'unstable' 'xserver-xorg-input-all' 'amd64,i386' '1' 'Provides: xorg-driver-input' +insertpackage 'unstable' 'xserver-xorg-video-all' 'amd64,i386' '1' 'Provides: xorg-driver-video' +insertpackage 'unstable' 'xorgxrdp' 'amd64,i386' '1' 'Provides: xorg-driver-input, xorg-driver-video +Priority: extra' + setupaptarchive msgmsg 'The setup is' 'fine' @@ -178,3 +188,46 @@ The following NEW packages will be installed: 0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. Inst git-rec-ng (1:2.26.2-1 unstable [amd64]) Conf git-rec-ng (1:2.26.2-1 unstable [amd64])' apt install git-rec-ng -s + +msgmsg 'Check that we do not merge unrelated things' + +testsuccessequal 'Reading package lists... +Building dependency tree... +Solving dependencies... +The following additional packages will be installed: + xserver-xorg-input-all xserver-xorg-video-all +The following NEW packages will be installed: + xserver-xorg xserver-xorg-input-all xserver-xorg-video-all +0 upgraded, 3 newly installed, 0 to remove and 2 not upgraded. +Inst xserver-xorg-input-all (1 unstable [amd64]) +Inst xserver-xorg-video-all (1 unstable [amd64]) +Inst xserver-xorg (1 unstable [amd64]) +Conf xserver-xorg-input-all (1 unstable [amd64]) +Conf xserver-xorg-video-all (1 unstable [amd64]) +Conf xserver-xorg (1 unstable [amd64])' apt install -s xserver-xorg + +testsuccessequal 'Reading package lists... +Building dependency tree... +Solving dependencies... +The following additional packages will be installed: + xserver-xorg-input-all xserver-xorg-video-all +The following NEW packages will be installed: + xserver-xorg-input-all xserver-xorg-noalt xserver-xorg-video-all +0 upgraded, 3 newly installed, 0 to remove and 2 not upgraded. +Inst xserver-xorg-input-all (1 unstable [amd64]) +Inst xserver-xorg-video-all (1 unstable [amd64]) +Inst xserver-xorg-noalt (1 unstable [amd64]) +Conf xserver-xorg-input-all (1 unstable [amd64]) +Conf xserver-xorg-video-all (1 unstable [amd64]) +Conf xserver-xorg-noalt (1 unstable [amd64])' apt install -s xserver-xorg-noalt + +testsuccessequal 'Reading package lists... +Building dependency tree... +Solving dependencies... +The following NEW packages will be installed: + xorgxrdp xserver-xorg +0 upgraded, 2 newly installed, 0 to remove and 2 not upgraded. +Inst xorgxrdp (1 unstable [amd64]) +Inst xserver-xorg (1 unstable [amd64]) +Conf xorgxrdp (1 unstable [amd64]) +Conf xserver-xorg (1 unstable [amd64])' apt install -s xserver-xorg xorgxrdp |