From d026713e341f4c95f67e84c5d7e3c49187c838ea Mon Sep 17 00:00:00 2001 From: mprahl Date: Feb 26 2019 13:29:49 +0000 Subject: Test the WaiverDB consumer when the type is brew-build This is to ensure the following doesn't regress: https://pagure.io/waiverdb/pull-request/286 --- diff --git a/functional-tests/conftest.py b/functional-tests/conftest.py index 924a285..32bd120 100644 --- a/functional-tests/conftest.py +++ b/functional-tests/conftest.py @@ -293,9 +293,10 @@ class TestDataBuilder(object): data['data']['scenario'] = scenario return self._create_result(data) - def create_waiver(self, nvr, testcase_name, product_version, comment, waived=True): + def create_waiver(self, nvr, testcase_name, product_version, comment, waived=True, + subject_type='koji_build'): data = { - 'subject_type': 'koji_build', + 'subject_type': subject_type, 'subject_identifier': nvr, 'testcase': testcase_name, 'product_version': product_version, diff --git a/functional-tests/consumers/test_waiverdb.py b/functional-tests/consumers/test_waiverdb.py index 86dd58e..9461226 100644 --- a/functional-tests/consumers/test_waiverdb.py +++ b/functional-tests/consumers/test_waiverdb.py @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ import mock +import pytest from greenwave.consumers import waiverdb @@ -12,10 +13,12 @@ TASKTRON_RELEASE_CRITICAL_TASKS = [ ] +@pytest.mark.parametrize('subject_type', ('koji_build', 'brew-build')) @mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.waiverdb.fedmsg.publish') def test_consume_new_waiver( - mock_fedmsg, load_config, requests_session, greenwave_server, testdatabuilder): + mock_fedmsg, load_config, requests_session, greenwave_server, testdatabuilder, + subject_type): load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() @@ -23,7 +26,8 @@ def test_consume_new_waiver( result = testdatabuilder.create_result( item=nvr, testcase_name=failing_test, - outcome='FAILED') + outcome='FAILED', + _type=subject_type) # The rest passed passing_tests = TASKTRON_RELEASE_CRITICAL_TASKS[1:] @@ -31,7 +35,8 @@ def test_consume_new_waiver( testdatabuilder.create_result( item=nvr, testcase_name=testcase_name, - outcome='PASSED') + outcome='PASSED', + _type=subject_type) for testcase_name in passing_tests ] @@ -39,7 +44,8 @@ def test_consume_new_waiver( waiver = testdatabuilder.create_waiver(nvr=nvr, testcase_name=testcase, product_version='fedora-26', - comment='Because I said so') + comment='Because I said so', + subject_type=subject_type) message = { 'body': { 'topic': 'waiver.new',