summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-02-11 21:21:12 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-14 19:08:45 +0100
commit175f950685df84395547119f93aa305866d7e36d (patch)
tree211da51e6bc95dc405a1d6a508a0429ad4568f87 /test/integration
parent2423207431980cb10c085b0890523b1e802c9ab4 (diff)
Fix test-phased-updates-upgrade
Our upgrade policy does not support specifying packagenames to upgrade commands that are not subject to the policy. It's possible this can be addressed at a later time, but let's not block the rest of the test from running.
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/solver3.broken1
-rwxr-xr-xtest/integration/test-phased-updates-upgrade4
2 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken
index 30137e796..876c23e68 100644
--- a/test/integration/solver3.broken
+++ b/test/integration/solver3.broken
@@ -5,7 +5,6 @@ test-apt-move-and-forget-manual-sections # TBD: Moving the au
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-phased-updates-upgrade # TBD: `upgrade` policy cannot be overriden by explicit arguments
test-prevent-markinstall-multiarch-same-versionscrew
test-resolve-by-keep-new-recommends
test-resolve-by-keep-obsolete-removals
diff --git a/test/integration/test-phased-updates-upgrade b/test/integration/test-phased-updates-upgrade
index 4f415f22e..15464bd3b 100755
--- a/test/integration/test-phased-updates-upgrade
+++ b/test/integration/test-phased-updates-upgrade
@@ -237,7 +237,7 @@ Conf depends-phased-dep (3 unstable-updates [all])
Conf phased-new (3 unstable-updates [all])
Conf depends-phased-new (3 unstable-updates [all])
Conf phased-security (3 unstable-updates [all])
-Conf phased-security-same (3 unstable-security, unstable-updates [all])" aptget $upgrade -s -q depends-phased-dep
+Conf phased-security-same (3 unstable-security, unstable-updates [all])" aptget $upgrade -s -q depends-phased-dep --solver internal # FIXME? 3.0 does not support overrides of the policy
done
testsuccessequal "Reading package lists...
@@ -257,7 +257,7 @@ Inst phased-security-same [1] (3 unstable-security, unstable-updates [all])
Conf phased-dep (3 unstable-updates [all])
Conf depends-phased-dep (3 unstable-updates [all])
Conf phased-security (3 unstable-updates [all])
-Conf phased-security-same (3 unstable-security, unstable-updates [all])" aptget upgrade -s -q depends-phased-dep
+Conf phased-security-same (3 unstable-security, unstable-updates [all])" aptget upgrade -s -q depends-phased-dep --solver internal # FIXME? 3.0 does not support overrides of the policy
# install does not respect phasing
testsuccessequal "Reading package lists...