From cf40c221d6682a940e0ddd4c7c8c298a72f0259a Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Mar 29 2019 09:59:46 +0000
Subject: [PATCH 1/2] Merge branch 'master' of ssh://pagure.io/greenwave


---

diff --git a/conf/policies/fedora.yaml b/conf/policies/fedora.yaml
index 0a6a7bf..3166454 100644
--- a/conf/policies/fedora.yaml
+++ b/conf/policies/fedora.yaml
@@ -122,7 +122,6 @@ decision_context: koji_build_push_missing_results
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: dist.rpmdeplint}
-
 # Policy for latest scenario test
 --- !Policy
 id: "compose-test-scenario"

From eeb6211d147eace499aab7abf0349b36824c7e32 Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Mar 29 2019 10:03:13 +0000
Subject: [PATCH 2/2] Fix Flake8


---

diff --git a/conf/policies/fedora.yaml b/conf/policies/fedora.yaml
index 3166454..0a6a7bf 100644
--- a/conf/policies/fedora.yaml
+++ b/conf/policies/fedora.yaml
@@ -122,6 +122,7 @@ decision_context: koji_build_push_missing_results
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: dist.rpmdeplint}
+
 # Policy for latest scenario test
 --- !Policy
 id: "compose-test-scenario"
diff --git a/greenwave/tests/test_resultsdb_consumer.py b/greenwave/tests/test_resultsdb_consumer.py
index e87e929..4f2b022 100644
--- a/greenwave/tests/test_resultsdb_consumer.py
+++ b/greenwave/tests/test_resultsdb_consumer.py
@@ -115,6 +115,7 @@ parameters = [
     ('fedora-messaging', 'greenwave.consumers.resultsdb.fedora_messaging.api.publish'),
 ]
 
+
 @pytest.mark.parametrize("config,publish", parameters)
 @mock.patch('greenwave.resources.ResultsRetriever.retrieve')
 @mock.patch('greenwave.resources.retrieve_decision')