From 33eed8e4b23d6eb573b94d014124171b9ed7878c Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Jul 10 2019 14:12:55 +0000 Subject: Omit logging product_version=None when matching policies Omit logging that applicable policies are matched with product_version=None (when product version guessing fails for a new test result). This can be confusing, because in such case, the product versions in applicable policies can be any value. Signed-off-by: Lukas Holecek --- diff --git a/greenwave/consumers/resultsdb.py b/greenwave/consumers/resultsdb.py index 92fb1b8..ae45baf 100644 --- a/greenwave/consumers/resultsdb.py +++ b/greenwave/consumers/resultsdb.py @@ -250,15 +250,20 @@ class ResultsDBHandler(fedmsg.consumers.FedmsgConsumer): submit_time (string): date. After this date, results will be ignored for comparison. testcase (munch.Munch): the name of a testcase to consider. """ + policy_attributes = dict( + subject_type=subject_type, + subject_identifier=subject_identifier, + testcase=testcase, + ) + product_version = _subject_product_version( subject_identifier, subject_type, self.koji_proxy) + if product_version: + policy_attributes['product_version'] = product_version + policies = self.flask_app.config['policies'] contexts_product_versions = applicable_decision_context_product_version_pairs( - policies, - subject_type=subject_type, - subject_identifier=subject_identifier, - testcase=testcase, - product_version=product_version) + policies, **policy_attributes) log.info('Getting greenwave info')