summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-02-07 21:00:17 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-07 21:00:17 +0100
commitcdf57541faf59ea5594c8e52c9e635ff0d7dbecc (patch)
tree1cb6c6a3524e35381e96896cc337d3778694fa14 /test
parenta186a14bdc914a0d12130b55f1f62c179c7e2086 (diff)
parentcce96b85691fac0bbbbb84a501c6f39a0c9125c0 (diff)
Merge branch 'solver3'
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-bug-549968-install-depends-of-not-installed1
-rwxr-xr-xtest/integration/test-bug-598669-install-postfix-gets-exim-heavy2
2 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/test-bug-549968-install-depends-of-not-installed b/test/integration/test-bug-549968-install-depends-of-not-installed
index 33cbd6ee4..ec730c7b2 100755
--- a/test/integration/test-bug-549968-install-depends-of-not-installed
+++ b/test/integration/test-bug-549968-install-depends-of-not-installed
@@ -38,6 +38,7 @@ Delete extracoolstuff:i386
[0] Reject:extracoolstuff:i386 ()
[0] Install:coolstuff:i386 (coolstuff:i386=1.0)
[0] Reject:extracoolstuff:i386=1.0 (not extracoolstuff:i386)
+Optional Item (0@0) coolstuff:i386 -> | extracoolstuff:i386=1.0
Optional Item (0@0) coolstuff:i386=1.0 -> | extracoolstuff:i386=1.0
Recommended packages:
diff --git a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
index d721bdaa8..6c9fb60c0 100755
--- a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
+++ b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture "i386"
setupaptarchive
-testfailuremsg "E: Conflict: exim4-daemon-light:i386 -> exim4-daemon-light:i386=4.72-1 -> not postfix:i386=2.7.1-1 but postfix:i386=2.7.1-1" aptget install postfix --solver 3.0
+testfailuremsg "E: Conflict: exim4-daemon-light:i386 -> not postfix:i386=2.7.1-1 but postfix:i386=2.7.1-1" aptget install postfix --solver 3.0
allowremovemanual
testfailureequal "Reading package lists...
Building dependency tree...