Skip to content

Commit b03066d

Browse files
committed
update errata to use filter method
- replaced duplicated filter query with method ErrataConnector::filter - fixup unittests to use paginated api - add fixture symlinks for exteranl_tests api
1 parent 564ad48 commit b03066d

5 files changed

+8
-8
lines changed

errata_tool/erratum.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -454,13 +454,10 @@ def externalTests(self, test_type=None):
454454
:param test_type: str, like "rpmdiff" or "covscan"
455455
:returns: a possibly-empty list of dicts, one per result.
456456
"""
457-
tmpl = '/api/v1/external_tests/?filter[active]=true'
458-
tmpl += '&filter[errata_id]={errata_id}'
459-
if test_type:
460-
tmpl += '&filter[test_type]={test_type}'
461-
url = tmpl.format(errata_id=self.errata_id, test_type=test_type)
462-
data = self.get_paginated_data(url)
463-
return data
457+
response = self.filter('/api/v1/external_tests', 'filter',
458+
active='true', errata_id=self.errata_id,
459+
test_type=test_type, paginated=True)
460+
return response['data']
464461

465462
def _get_build_list(self, check_signatures=False):
466463
# Grab build list; store on a per-key basis
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
external_tests/?filter[active]=true&filter[errata_id]=33840&filter[test_type]=rpmdiff&page[number]=1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
external_tests/?filter[active]=true&filter[errata_id]=33840&filter[test_type]=rpmdiff&page[number]=2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
external_tests/?filter[active]=true&filter[errata_id]=33840&filter[test_type]=rpmdiff&page[number]=1

errata_tool/tests/test_external_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class TestExternalTests(object):
66
def test_external_tests_url(self, monkeypatch, mock_get, advisory):
77
monkeypatch.setattr(requests, 'get', mock_get)
88
advisory.externalTests(test_type='rpmdiff')
9-
assert mock_get.response.url == 'https://errata.devel.redhat.com/api/v1/external_tests/?filter[active]=true&filter[errata_id]=33840&filter[test_type]=rpmdiff&page[number]=2' # NOQA: E501
9+
assert mock_get.response.url == 'https://errata.devel.redhat.com/api/v1/external_tests?filter[active]=true&filter[errata_id]=33840&filter[paginated]=True&filter[test_type]=rpmdiff&page[number]=2' # NOQA: E501
1010

1111
def test_external_tests_data(self, monkeypatch, mock_get, advisory):
1212
monkeypatch.setattr(requests, 'get', mock_get)

0 commit comments

Comments
 (0)