summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-handling-broken-orgroups2
-rwxr-xr-xtest/integration/test-solver3-obsoleted-by7
2 files changed, 6 insertions, 3 deletions
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index 1c20ae4f1..50b158752 100755
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -95,7 +95,7 @@ Inst coolstuff-provided (1.0-1 unstable [all])
Conf extrastuff (1.0-1 unstable [all])
Conf coolstuff-provided (1.0-1 unstable [all])' aptget install coolstuff-provided -s
-testfailuremsg 'E: Unsatisfiable dependency group coolstuff-provided-broken:i386=1.0-1 -> cool2:i386' aptget install coolstuff-provided-broken --solver 3.0 -s
+testfailuremsg 'E: Conflict: coolstuff-provided-broken:i386=1.0-1 -> extrastuff:i386=1.0-1 but not extrastuff:i386=1.0-1' aptget install coolstuff-provided-broken --solver 3.0 -s
testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
diff --git a/test/integration/test-solver3-obsoleted-by b/test/integration/test-solver3-obsoleted-by
index 031589bb4..486c55c58 100755
--- a/test/integration/test-solver3-obsoleted-by
+++ b/test/integration/test-solver3-obsoleted-by
@@ -66,9 +66,12 @@ testobsolete "Obsolete: not-yet-built:amd64 - not installable
Obsolete: good:amd64 - not installable
Obsolete: obsolete:amd64 - not installable
Obsolete: obsolete-in-experimental:amd64 - not installable
-Obsolete: current-version:amd64 - not installable
+Obsolete: obsolete-reason:amd64 - not installable
Obsolete: local-only:amd64 - not installable
-Obsolete: obsolete-in-downgrade:amd64 - not installable" aptget dist-upgrade
+Obsolete: obsolete-in-experimental-reason:amd64 - not installable
+Obsolete: current-version:amd64 - not installable
+Obsolete: obsolete-in-downgrade:amd64 - not installable
+Obsolete: obsolete-in-downgrade-reason:amd64 - not installable" aptget dist-upgrade
testobsolete "Obsolete: obsolete:amd64=1 due to obsolete-reason:amd64=2
Obsolete: obsolete-in-experimental:amd64=1 due to obsolete-in-experimental-reason:amd64=2