From a427a7f4d65f17b792dbbfac8f1a3483c686f519 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Apr 05 2019 08:34:20 +0000 Subject: Use the app settings for GREENWAVE_API_URL in functional tests. This commits sets GREENWAVE_API_URL to the localhost in the development and testing settings. It also remove the mock to fedmsg config which is not needed anymore. Signed-off-by: Clement Verna --- diff --git a/functional-tests/consumers/test_resultsdb.py b/functional-tests/consumers/test_resultsdb.py index c6ad37a..6146874 100644 --- a/functional-tests/consumers/test_resultsdb.py +++ b/functional-tests/consumers/test_resultsdb.py @@ -27,12 +27,10 @@ def create_resultdb_handler(cache_config=None): return handler -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_consume_new_result( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr(product_version='fc26') result = testdatabuilder.create_result(item=nvr, testcase_name='dist.rpmdeplint', @@ -168,12 +166,10 @@ def test_consume_new_result( } -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_consume_unchanged_result( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr(product_version='fc26') testdatabuilder.create_result( @@ -203,13 +199,11 @@ def test_consume_unchanged_result( assert len(mock_fedmsg.mock_calls) == 0 -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_invalidate_new_result_with_mocked_cache( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): """ Consume a result, and ensure that `delete` is called. """ - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() result = testdatabuilder.create_result( item=nvr, testcase_name='dist.rpmdeplint', outcome='PASSED') @@ -241,12 +235,10 @@ def test_invalidate_new_result_with_mocked_cache( assert handler.cache.delete.call_count == 2 -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_invalidate_new_result_with_real_cache( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder, cache_config): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() for testcase_name in ['dist.rpmdeplint', 'dist.upgradepath', 'dist.abicheck']: testdatabuilder.create_result( @@ -310,13 +302,11 @@ def test_invalidate_new_result_with_real_cache( assert not response['policies_satisfied'], pprint.pformat(response) -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_invalidate_new_result_with_no_preexisting_cache( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): """ Ensure that invalidating an unknown value is sane. """ - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() result = testdatabuilder.create_result( item=nvr, testcase_name='dist.rpmdeplint', outcome='PASSED') @@ -348,12 +338,10 @@ def test_invalidate_new_result_with_no_preexisting_cache( assert handler.cache.delete.call_count == 2 -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_consume_compose_id_result( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} compose_id = testdatabuilder.unique_compose_id() result = testdatabuilder.create_compose_result( compose_id=compose_id, @@ -418,10 +406,9 @@ def test_consume_compose_id_result( mock_fedmsg.assert_called_once_with(topic='decision.update', msg=msg) -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_consume_legacy_result( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): """ Test that we can still handle the old legacy "taskotron" format. @@ -429,7 +416,6 @@ def test_consume_legacy_result( need to be able to handle this taskotron format for the transition. """ - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr(product_version='fc26') result = testdatabuilder.create_result(item=nvr, testcase_name='dist.rpmdeplint', @@ -551,12 +537,10 @@ def test_consume_legacy_result( mock_fedmsg.assert_any_call(topic='decision.update', msg=second_msg) -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_no_message_for_nonapplicable_policies( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() # One result gets the decision in a certain state. testdatabuilder.create_result(item=nvr, @@ -590,12 +574,10 @@ def test_no_message_for_nonapplicable_policies( mock_fedmsg.assert_not_called() -@mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') @mock.patch('greenwave.consumers.resultsdb.fedmsg.publish') def test_consume_new_result_container_image( - mock_fedmsg, load_config, requests_session, greenwave_server, + mock_fedmsg, requests_session, greenwave_server, testdatabuilder): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = 'fedora@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433' result = testdatabuilder.create_result(item=nvr, testcase_name='baseos-qe.baseos-ci.tier1.functional', diff --git a/functional-tests/consumers/test_waiverdb.py b/functional-tests/consumers/test_waiverdb.py index 9461226..49b3a0e 100644 --- a/functional-tests/consumers/test_waiverdb.py +++ b/functional-tests/consumers/test_waiverdb.py @@ -14,12 +14,10 @@ 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, requests_session, greenwave_server, testdatabuilder, subject_type): - load_config.return_value = {'greenwave_api_url': greenwave_server + 'api/v1.0'} nvr = testdatabuilder.unique_nvr() failing_test = TASKTRON_RELEASE_CRITICAL_TASKS[0] diff --git a/greenwave/config.py b/greenwave/config.py index a01140b..f427d0f 100644 --- a/greenwave/config.py +++ b/greenwave/config.py @@ -49,6 +49,7 @@ class DevelopmentConfig(Config): RESULTSDB_API_URL = 'http://localhost:5001/api/v2.0' #WAIVERDB_API_URL = 'http://waiverdb-dev.fedorainfracloud.org/api/v1.0' WAIVERDB_API_URL = 'http://localhost:5004/api/v1.0' + GREENWAVE_API_URL = 'http://localhost:5005/api/v1.0' POLICIES_DIR = os.path.join( os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'conf', 'policies' @@ -58,6 +59,7 @@ class DevelopmentConfig(Config): class TestingConfig(Config): RESULTSDB_API_URL = 'http://localhost:5001/api/v2.0' WAIVERDB_API_URL = 'http://localhost:5004/api/v1.0' + GREENWAVE_API_URL = 'http://localhost:5005/api/v1.0' POLICIES_DIR = os.path.join( os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'conf', 'policies'