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.

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]);