summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2024-05-24 15:17:41 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2024-05-24 17:01:55 +0200
commit56737e4bdb58e03eeea6f915259f3a18a79642a3 (patch)
tree8168f6df9f58852e81c8de707bb832cdd152cfbc /test
parentacb77872861834d3c5b98ca2e81e0336a388e9f0 (diff)
test-bug-758153-versioned-provides-support: Solver 3.0 support
The previous commit basically fixes this, it just requires some minor small adjustments
Diffstat (limited to 'test')
-rw-r--r--test/integration/solver3.broken1
-rwxr-xr-xtest/integration/test-bug-758153-versioned-provides-support10
2 files changed, 9 insertions, 2 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken
index 57ab7ba57..65e18a7ff 100644
--- a/test/integration/solver3.broken
+++ b/test/integration/solver3.broken
@@ -15,7 +15,6 @@ test-bug-675449-essential-are-protected
test-bug-709560-set-candidate-release
test-bug-745046-candidate-propagation-fails
test-bug-753297-upgradable
-test-bug-758153-versioned-provides-support
test-bug-767891-force-essential-important
test-bug-961266-hold-means-hold
test-dont-forget-conflicts-via-unknown-architectures
diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
index 7bf9d76bd..a057d33a8 100755
--- a/test/integration/test-bug-758153-versioned-provides-support
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -7,6 +7,7 @@ set -e
TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
+allowremovemanual
configarchitecture 'amd64' 'i386'
insertinstalledpackage 'webapp' 'all' '1' 'Depends: httpd'
@@ -393,11 +394,18 @@ Inst needsselfprov12 (1 unstable [amd64])
Conf selfprov (2 unstable [amd64])
Conf needsselfprov12 (1 unstable [amd64])" aptget install needsselfprov12 -s --solver $solver
if [ "$solver" = 'apt' ]; then
+if [ "$APT_SOLVER" = "3.0" ]; then
+TOPDEPENDS=" needsselfprov123 : Depends: selfprov (= 1)
+ Depends: selfprov (= 2)
+ Depends: selfprov (= 3)"
+else
+TOPDEPENDS=" needsselfprov123 : Depends: selfprov (= 3)"
+fi
testfailureequal "$HEADER
The solver encountered an error of type: ERR_UNSOLVABLE
The following information might help you to understand what is wrong:
The following packages have unmet dependencies:
- needsselfprov123 : Depends: selfprov (= 3)
+$TOPDEPENDS
$SOMEPACKAGESCOULDNOT
needsselfprov123 : Depends: selfprov (= 1)