solver3: Only merge dependencies on the same package

Avoid or groups and dependencies on different (virtual) packages,
to avoid some common pitfalls like the added xorg test case.

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