diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/solver3.broken | 2 | ||||
| -rwxr-xr-x | test/integration/test-bug-591882-conkeror | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index 65e18a7ff..9228e46c8 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -8,7 +8,6 @@ test-apt-move-and-forget-manual-sections test-apt-patterns test-apt-source-and-build-dep test-bug-470115-new-and-tighten-recommends -test-bug-591882-conkeror test-bug-602412-dequote-redirect test-bug-611729-mark-as-manual test-bug-675449-essential-are-protected @@ -29,7 +28,6 @@ test-prevent-markinstall-multiarch-same-versionscrew test-release-candidate-switching test-resolve-by-keep-new-recommends test-resolver-provider-exchange -test-suggests-promoted-to-recommends test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings test-ubuntu-bug-1304403-obsolete-priority-standard test-ubuntu-bug-1990586 diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror index 6b903431a..21c569756 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 |