aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 12:59:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 14:55:15 +0000
commitb34478026e46e3f78c6ea1cbbda130843ca73d95 (patch)
tree9209c369dee520aff2e57bbdd3a26a01566cff65
parent8122449d5360fa0f07f18d69adcd21c4877e1899 (diff)
downloadpaludis-b34478026e46e3f78c6ea1cbbda130843ca73d95.tar.gz
paludis-b34478026e46e3f78c6ea1cbbda130843ca73d95.tar.xz
Test transient blockers too
-rw-r--r--paludis/resolver/resolver_TEST_blockers.cc22
1 files changed, 17 insertions, 5 deletions
diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc
index f3c0dac..3bc2b89 100644
--- a/paludis/resolver/resolver_TEST_blockers.cc
+++ b/paludis/resolver/resolver_TEST_blockers.cc
@@ -68,7 +68,13 @@ namespace test_cases
{
struct TestHardBlocker : ResolverBlockersTestCase
{
- TestHardBlocker() : ResolverBlockersTestCase("hard") { }
+ const bool transient;
+
+ TestHardBlocker(const bool t) :
+ ResolverBlockersTestCase("hard" + std::string(t ? " transient" : "")),
+ transient(t)
+ {
+ }
void run()
{
@@ -101,15 +107,21 @@ namespace test_cases
);
}
}
- } test_hard_blocker;
+ } test_hard_blocker(false), test_hard_blocker_transient(true);
struct TestUnfixableBlocker : ResolverBlockersTestCase
{
- TestUnfixableBlocker() : ResolverBlockersTestCase("unfixable") { }
+ const bool transient;
+
+ TestUnfixableBlocker(const bool t) :
+ ResolverBlockersTestCase("unfixable" + std::string(t ? " transient" : "")),
+ transient(t)
+ {
+ }
void run()
{
- install("unfixable", "a-pkg", "1");
+ install("unfixable", "a-pkg", "1")->transient_key()->set_value(transient);
std::tr1::shared_ptr<const ResolverLists> resolutions(get_resolutions("unfixable/target"));
@@ -136,6 +148,6 @@ namespace test_cases
);
}
}
- } test_unfixable_blocker;
+ } test_unfixable_blocker(false), test_unfixable_blocker_transient(true);
}