summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2010-04-20 08:39:18 -0700
committerDaniel Burrows <dburrows@debian.org>2010-04-20 08:39:18 -0700
commit81c463456e9e67cf894286c78d6b9c342fdf67ac (patch)
tree5a46aca111012218ef7fd0d7c4f0c6a29bd3fde5 /tests
parent4d0d07d1bb75ba3c1ebc532d85eb05a84ac3f6e7 (diff)
downloadaptitude-81c463456e9e67cf894286c78d6b9c342fdf67ac.tar.gz
Allow "conflict" to be specified as a safety level again, with its old behavior, and fix setting safety levels using the old names.
aptitude's behavior should now be fully compatible with pre-0.6.2 releases (by default). The safety level change fixes the fact that you could raise safety levels using the old names but not lower them.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_resolver_hints.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/test_resolver_hints.cc b/tests/test_resolver_hints.cc
index b4ca2cb4..8a0d3010 100644
--- a/tests/test_resolver_hints.cc
+++ b/tests/test_resolver_hints.cc
@@ -88,6 +88,12 @@ namespace
hint::version_selection::make_inst(),
"safety",
INT_MAX)),
+ test("increase-tier-to conflict xroach",
+ hint::make_discard(pattern::make_exact_name("xroach"),
+ hint::version_selection::make_inst())),
+ test("increase-tier-to discard bob",
+ hint::make_discard(pattern::make_exact_name("bob"),
+ hint::version_selection::make_inst())),
test("increase-tier-to 800 xroach",
hint::make_raise_cost_component(pattern::make_exact_name("xroach"),
hint::version_selection::make_inst(),
@@ -105,6 +111,12 @@ namespace
hint::version_selection::make_inst(),
"albertComponent",
299)),
+ test("discard albert",
+ hint::make_discard(pattern::make_exact_name("albert"),
+ hint::version_selection::make_inst())),
+ test("discard xyzzy /unstable",
+ hint::make_discard(pattern::make_exact_name("xyzzy"),
+ hint::version_selection::make_archive("unstable"))),
};
const int num_resolver_tests =
sizeof(resolver_tests) / sizeof(resolver_tests[0]);