Fixed broken tests.

hikari-py · Sep 23, 2020 · 99d1fd9 · 99d1fd9
1 parent ebe6bab
commit 99d1fd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/hikari/errors.py b/hikari/errors.py
@@ -202,7 +202,7 @@ class HTTPClientClosedError(HTTPError):
 
 
 @typing.final
-class RESTErrorCode(str, enums.Enum):
+class RESTErrorCode(int, enums.Enum):
     """Error codes provided as further info on errors returned by the REST API."""
 
     GENERAL_ERROR = 0

diff --git a/hikari/utilities/net.py b/hikari/utilities/net.py
@@ -48,8 +48,7 @@ async def generate_error_response(response: aiohttp.ClientResponse) -> errors.HT
         json_body = await response.json()
         args.append(json_body.get("message", ""))
         args.append(errors.RESTErrorCode(json_body.get("code", 0)))
-
-    except (aiohttp.ContentTypeError):
+    except aiohttp.ContentTypeError:
         pass
 
     if response.status == http.HTTPStatus.BAD_REQUEST:
@@ -63,15 +62,12 @@ async def generate_error_response(response: aiohttp.ClientResponse) -> errors.HT
 
     status = http.HTTPStatus(response.status)
 
-    cls: typing.Type[errors.HikariError]
     if 400 <= status < 500:
-        cls = errors.ClientHTTPResponseError
+        return errors.ClientHTTPResponseError(real_url, status, response.headers, raw_body)
     elif 500 <= status < 600:
-        cls = errors.InternalServerError
+        return errors.InternalServerError(real_url, status, response.headers, raw_body)
     else:
-        cls = errors.HTTPResponseError
-
-    return cls(real_url, status, response.headers, raw_body)
+        return errors.HTTPResponseError(real_url, status, response.headers, raw_body)
 
 
 def create_tcp_connector(

diff --git a/tests/hikari/utilities/test_net.py b/tests/hikari/utilities/test_net.py
@@ -79,9 +79,10 @@ async def json(self):
         (http.HTTPStatus.NOT_FOUND, "NotFoundError"),
     ],
 )
-@pytest.mark.parametrize("json_response", [aiohttp.ContentTypeError(None, None), KeyError])
 @pytest.mark.asyncio
-async def test_generate_error_when_error_with_json(status_, expected_error, json_response):
+async def test_generate_error_when_error_with_json(status_, expected_error):
+    json_response = aiohttp.ContentTypeError(None, None)
+
     class StubResponse:
         real_url = "https://some.url"
         status = status_