summaryrefslogtreecommitdiffstats
path: root/test/integration/test-bug-591882-conkeror
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 02:48:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 02:48:10 +0000
commit7f9ceaec776a597e9ff8451038d57dd75e1e6d18 (patch)
tree284aa831d7c1c097a28b9048e594e071efa8e65c /test/integration/test-bug-591882-conkeror
parentReleasing progress-linux version 2.9.3-0.0~progress7.99u1. (diff)
downloadapt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.tar.xz
apt-7f9ceaec776a597e9ff8451038d57dd75e1e6d18.zip
Merging upstream version 2.9.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-xtest/integration/test-bug-591882-conkeror3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index 6b90343..21c5697 100755
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -4,6 +4,7 @@ set -e
TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
+allowremovemanual
configarchitecture "i386"
setupaptarchive
@@ -73,5 +74,5 @@ After this operation, 36.0 MB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation."
# Test that the old behavior can be restored with the option
-testfailureequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0
+testfailureequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0 --solver internal
testfailureequal "$UPGRADESUCCESS" aptget dist-upgrade --trivial-only #-o pkgProblemResolver::FixByInstall=0