🤖 black and isort files

ExpDev07 · May 20, 2020 · 6a0bea5 · 6a0bea5
1 parent 9d89eb3
commit 6a0bea5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/app/utils/populations.py b/app/utils/populations.py
@@ -2,9 +2,8 @@
 import json
 import logging
 
-import requests
-
 import app.io
+import requests
 
 LOGGER = logging.getLogger(__name__)
 GEONAMES_URL = "http://api.geonames.org/countryInfoJSON"

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -7,11 +7,11 @@
 import os
 
 import pytest
-from async_asgi_testclient import TestClient as AsyncTestClient
-from fastapi.testclient import TestClient
 
 from app.main import APP
 from app.utils import httputils
+from async_asgi_testclient import TestClient as AsyncTestClient
+from fastapi.testclient import TestClient
 
 try:
  from unittest.mock import AsyncMock

diff --git a/tests/test_jhu.py b/tests/test_jhu.py
@@ -35,9 +35,24 @@ async def test_get_locations(mock_client_session):
 @pytest.mark.parametrize(
  "key, locations, index, expected",
  [
- (("Thailand", "TH"), [{"country": "Thailand", "province": "TH", "history": {"test": "yes"}}], 0, {"test": "yes"}), # Success
- (("Deutschland", "DE"), [{"country": "Deutschland", "province": "DE", "history": {"test": "no"}}], 1, {}), # IndexError
- (("US", "NJ"), [{"country": "Deutschland", "province": "DE", "history": {"test": "no"}}], 0, {}), # Invaid Key Merge
+ (
+ ("Thailand", "TH"),
+ [{"country": "Thailand", "province": "TH", "history": {"test": "yes"}}],
+ 0,
+ {"test": "yes"},
+ ), # Success
+ (
+ ("Deutschland", "DE"),
+ [{"country": "Deutschland", "province": "DE", "history": {"test": "no"}}],
+ 1,
+ {},
+ ), # IndexError
+ (
+ ("US", "NJ"),
+ [{"country": "Deutschland", "province": "DE", "history": {"test": "no"}}],
+ 0,
+ {},
+ ), # Invaid Key Merge
  ],
 )
 def test_parse_history(key, locations, index, expected):

diff --git a/tests/test_location_service.py b/tests/test_location_service.py
@@ -2,8 +2,10 @@
 
 from app.services.location import LocationService
 
+
 class GoodLocationService(LocationService):
  """Valid LocationService Class."""
+
  async def get_all(self):
  """
  Gets and returns all of the locations.
@@ -16,8 +18,10 @@ async def get(self, id): # pylint: disable=redefined-builtin,invalid-name
  """
  return id
 
+
 class BadLocationService(LocationService):
  """Invalid LocationService Class."""
+
  pass
 
 
@@ -32,5 +36,4 @@ async def test_location_service_invalid():
  """Test for location service interface valid class."""
  good_loc_service = GoodLocationService()
  assert [1] == await good_loc_service.get_all()
- assert 1 == await good_loc_service.get(1) 
-
+ assert 1 == await good_loc_service.get(1)
diff --git a/tests/test_populations.py b/tests/test_populations.py
@@ -1,10 +1,10 @@
 """tests.test_populations.py"""
 import pytest
-import requests.exceptions
-import responses
 
 import app.io
 import app.utils.populations
+import requests.exceptions
+import responses
 
 NOT_FOUND_HTML = """<!DOCTYPE html>
 <html lang="en">

diff --git a/tests/test_routes.py b/tests/test_routes.py
@@ -4,9 +4,9 @@
 from unittest import mock
 
 import pytest
-from async_asgi_testclient import TestClient
 
 from app.main import APP
+from async_asgi_testclient import TestClient
 
 from .conftest import mocked_strptime_isoformat
 from .test_jhu import DATETIME_STRING
@@ -181,4 +181,4 @@ async def test_latest(async_api_client, query_params, mock_client_session):
 
  assert response.status_code == 200
  assert response_json["latest"]["confirmed"]
- assert response_json["latest"]["deaths"]
+ assert response_json["latest"]["deaths"]