Merge branch 'solver3' into 'main'

solver3: Various bug fixes

See merge request apt-team/apt!459

2 files changed, 55 insertions, 0 deletions

diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index bc32886c5..cbfd7b739 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -136,6 +136,43 @@ testsuccess test -s "$APT_EDSP_DUMP_FILENAME"
 testequal 'Install: awesomecoolstuff:i386' grep :i386 "$APT_EDSP_DUMP_FILENAME"
 testfailure grep -e ':amd64' -e 'Architecture: any' "$APT_EDSP_DUMP_FILENAME"
 
+rm -f "$APT_EDSP_DUMP_FILENAME"
+testfailure apt upgrade --solver dump
+testsuccess test -s "$APT_EDSP_DUMP_FILENAME"
+testsuccessequal "Request: EDSP 0.5
+Architecture: amd64
+Architectures: amd64 i386
+Machine-ID: 912e43bd1c1d4ba481f9f8ccab25f9ee
+Upgrade-All: yes
+Upgrade: yes
+Forbid-New-Install: no
+Forbid-Remove: yes
+Solver: dump" awk '/^$/ {exit} {print}' "$APT_EDSP_DUMP_FILENAME"
+
+rm -f "$APT_EDSP_DUMP_FILENAME"
+testfailure aptget upgrade --solver dump
+testsuccess test -s "$APT_EDSP_DUMP_FILENAME"
+testsuccessequal "Request: EDSP 0.5
+Architecture: amd64
+Architectures: amd64 i386
+Machine-ID: 912e43bd1c1d4ba481f9f8ccab25f9ee
+Upgrade-All: yes
+Upgrade: yes
+Forbid-New-Install: yes
+Forbid-Remove: yes
+Solver: dump" awk '/^$/ {exit} {print}' "$APT_EDSP_DUMP_FILENAME"
+
+rm -f "$APT_EDSP_DUMP_FILENAME"
+testfailure aptget dist-upgrade --solver dump
+testsuccess test -s "$APT_EDSP_DUMP_FILENAME"
+testsuccessequal "Request: EDSP 0.5
+Architecture: amd64
+Architectures: amd64 i386
+Machine-ID: 912e43bd1c1d4ba481f9f8ccab25f9ee
+Upgrade-All: yes
+Dist-Upgrade: yes
+Solver: dump" awk '/^$/ {exit} {print}' "$APT_EDSP_DUMP_FILENAME"
+
 testsuccess aptget dist-upgrade -s
 testsuccess aptget dist-upgrade -s --solver apt
 
diff --git a/test/integration/test-solver3-similar-depends b/test/integration/test-solver3-similar-depends
new file mode 100755
index 000000000..a301b9ac5
--- /dev/null
+++ b/test/integration/test-solver3-similar-depends
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
+setupenvironment
+configarchitecture 'amd64'
+
+insertpackage 'installed' 'a' 'all' '2' 'Depends: a|b'
+insertpackage 'unstable' 'a' 'all' '3' 'Depends: a|c'
+
+setupaptarchive
+testsuccess apt install -o debug::apt::solver=3 a -s --solver 3.0
+cp rootdir/tmp/testsuccess.output log
+msgmsg "Test that æ|b and a|c are different or groups"
+testsuccess grep "Found dependency critical a:amd64=2 -> a:amd64" log
+testsuccess grep "Found dependency critical a:amd64=3 -> a:amd64" log
+