From b34ac3bdd93c5a9f41e8c33c965ec1d2fa47b975 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 19 Dec 2016 18:27:38 +0000 Subject: [PATCH] Add a verdict field to all policies with the actual verdict Signed-off-by: Niels Thykier --- britney2/policies/policy.py | 6 +++++- tests/test_policy.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/britney2/policies/policy.py b/britney2/policies/policy.py index 5bbbf39..d5ad271 100644 --- a/britney2/policies/policy.py +++ b/britney2/policies/policy.py @@ -99,7 +99,11 @@ class BasePolicy(object): def apply_policy(self, general_policy_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse): pinfo = {} general_policy_info[self.policy_id] = pinfo - return self.apply_policy_impl(pinfo, suite, source_name, source_data_tdist, source_data_srcdist, excuse) + verdict = self.apply_policy_impl(pinfo, suite, source_name, source_data_tdist, source_data_srcdist, excuse) + # The base policy provides this field, so the subclass should leave it blank + assert 'verdict' not in pinfo + pinfo['verdict'] = verdict.name + return verdict @abstractmethod def apply_policy_impl(self, policy_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse): # pragma: no cover diff --git a/tests/test_policy.py b/tests/test_policy.py index dd468d4..1e6bfa4 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -54,8 +54,10 @@ def create_policy_objects(source_name, target_version, source_version): def apply_policy(policy, expected_verdict, src_name, *, suite='unstable', source_version='1.0', target_version='2.0'): src_t, src_u, excuse, policy_info = create_policy_objects(src_name, source_version, target_version) verdict = policy.apply_policy(policy_info, suite, src_name, src_t, src_u, excuse) + pinfo = policy_info[policy.policy_id] assert verdict == expected_verdict - return policy_info[policy.policy_id] + assert pinfo['verdict'] == expected_verdict.name + return pinfo class TestRCBugsPolicy(unittest.TestCase):