summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-02-11 21:26:10 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-14 19:08:45 +0100
commitfdc8682db546077cb24b2cc8861b2d5e4eee9da5 (patch)
tree02edc0e237c3d2e757f6c9ab3537e1906c0cbfe6
parent175f950685df84395547119f93aa305866d7e36d (diff)
test-dont-forget-conflicts-via-unknown-architectures: Use install, not upgrade
The 3.0 solver does not support upgrade arguments to override the policy.
-rw-r--r--test/integration/solver3.broken1
-rwxr-xr-xtest/integration/test-dont-forget-conflicts-via-unknown-architectures3
2 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken
index 876c23e68..33167b239 100644
--- a/test/integration/solver3.broken
+++ b/test/integration/solver3.broken
@@ -4,7 +4,6 @@ test-apt-install-order-matters-a-bit # Wontfix: Cannot fi
test-apt-move-and-forget-manual-sections # TBD: Moving the auto bit is not implemented
test-bug-470115-new-and-tighten-recommends
test-bug-602412-dequote-redirect
-test-dont-forget-conflicts-via-unknown-architectures # TBD: `apt upgrade` is not allowed to remove packages at all with 3.0
test-prevent-markinstall-multiarch-same-versionscrew
test-resolve-by-keep-new-recommends
test-resolve-by-keep-obsolete-removals
diff --git a/test/integration/test-dont-forget-conflicts-via-unknown-architectures b/test/integration/test-dont-forget-conflicts-via-unknown-architectures
index 07d5d8f84..f8b41c69a 100755
--- a/test/integration/test-dont-forget-conflicts-via-unknown-architectures
+++ b/test/integration/test-dont-forget-conflicts-via-unknown-architectures
@@ -6,6 +6,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
setupenvironment
configarchitecture 'arm64'
configdpkgnoopchroot
+allowremovemanual
buildsimplenativepackage 'pkga' 'arm64' '1' 'stable'
buildsimplenativepackage 'pkgb' 'arm64' '1' 'stable'
@@ -38,6 +39,6 @@ testsuccess apt update
#apt upgrade pkga -o Debug::pkgDpkgPm=1 -y -o Dpkg::use-pty=0
rm -f rootdir/var/cache/apt/*.bin
-testsuccess apt upgrade pkga -y
+testsuccess apt install pkga -y
testdpkginstalled 'pkga'
testdpkgnotinstalled 'pkgb'