MBSResolver: use requests.Response.raise_for_status()

Simplify and avoid extra uncovered code paths.
This commit is contained in:
Owen W. Taylor
2020-11-20 15:51:32 -05:00
parent 7788c4f3f7
commit abd731397f

View File

@@ -24,7 +24,6 @@ class MBSResolver(KojiResolver):
def __init__(self, db_session, config):
self.db_session = db_session
self.mbs_prod_url = config.mbs_url
self._generic_error = "Failed to query MBS with query %r returned HTTP status %s"
def _query_from_nsvc(self, name, stream, version=None, context=None, states=None):
"""
@@ -75,8 +74,7 @@ class MBSResolver(KojiResolver):
while True:
res = requests_session.get(self.mbs_prod_url, params=query)
if not res.ok:
raise RuntimeError(self._generic_error % (query, res.status_code))
res.raise_for_status()
data = res.json()
modules_per_page = data["items"]
@@ -115,8 +113,7 @@ class MBSResolver(KojiResolver):
query = {"page": 1, "per_page": 1, "short": True}
query.update(kwargs)
res = requests_session.get(self.mbs_prod_url, params=query)
if not res.ok:
raise RuntimeError(self._generic_error % (query, res.status_code))
res.raise_for_status()
data = res.json()
return data["meta"]["total"]
@@ -139,8 +136,7 @@ class MBSResolver(KojiResolver):
"virtual_stream": virtual_stream,
}
res = requests_session.get(self.mbs_prod_url, params=query)
if not res.ok:
raise RuntimeError(self._generic_error % (query, res.status_code))
res.raise_for_status()
data = res.json()
if data["items"]: