From 1c87c6c7a25a85560984743b833d4c6af030ad92 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Jun 25 2019 12:04:48 +0000 Subject: Get koji_build and brew-build results in single query Signed-off-by: Lukas Holecek --- diff --git a/greenwave/resources.py b/greenwave/resources.py index c24feed..715ca4a 100644 --- a/greenwave/resources.py +++ b/greenwave/resources.py @@ -64,13 +64,10 @@ class ResultsRetriever(object): def _retrieve_helper(self, params, subject_type, subject_identifier): results = [] if subject_type == 'koji_build': - params['type'] = subject_type + params['type'] = 'koji_build,brew-build' params['item'] = subject_identifier results = self._make_request(params=params) - params['type'] = 'brew-build' - results.extend(self._make_request(params=params)) - del params['type'] del params['item'] params['original_spec_nvr'] = subject_identifier diff --git a/greenwave/tests/test_policies.py b/greenwave/tests/test_policies.py index 847e014..5fa4208 100644 --- a/greenwave/tests/test_policies.py +++ b/greenwave/tests/test_policies.py @@ -40,7 +40,7 @@ class DummyResultsRetriever(ResultsRetriever): def _make_request(self, params): if (params.get('item') == self.subject_identifier and - params.get('type') == self.subject_type and + ('type' not in params or self.subject_type in params['type'].split(',')) and params.get('testcases') == self.testcase): return [{ 'id': 123,