fix: isort imports

connexion/apis/aiohttp_api.py

@@ -4,20 +4,16 @@
 from urllib.parse import parse_qs
 
 import jinja2
-import six
 
 import aiohttp_jinja2
 from aiohttp import web
-from aiohttp.payload import Payload
 from aiohttp.web_exceptions import HTTPNotFound
 from connexion.apis.abstract import AbstractAPI
 from connexion.exceptions import OAuthProblem
 from connexion.handlers import AuthErrorHandler
 from connexion.lifecycle import ConnexionRequest, ConnexionResponse
 from connexion.operations.validation import validate_operation_output
-from connexion.utils import (
-    Jsonifier
-)
+from connexion.utils import Jsonifier
 
 try:
     import ujson as json

tests/api/test_abstract.py

@@ -1,7 +1,6 @@
 import json
 
 import pytest
-
 from connexion.apis import AbstractAPI
 from connexion.utils import Jsonifier
 

tests/api/test_aiohttp_api.py

@@ -1,5 +1,4 @@
 import pytest
-
 from aiohttp.web import Response, StreamResponse
 from connexion.apis.aiohttp_api import AioHttpApi
 from connexion.lifecycle import ConnexionResponse

tests/api/test_bootstrap.py

@@ -1,12 +1,10 @@
-import json
-
 import jinja2
 import yaml
 from openapi_spec_validator.loaders import ExtendedSafeLoader
 
 import mock
 import pytest
-from conftest import TEST_FOLDER, build_app_from_fixture, SPECS
+from conftest import SPECS, TEST_FOLDER, build_app_from_fixture
 from connexion import App
 from connexion.exceptions import InvalidSpecification
 from connexion.lifecycle import ConnexionResponse

tests/conftest.py

@@ -3,16 +3,18 @@
 import pathlib
 import sys
 
-import pytest
 import six
-from connexion import App
+
+import pytest
+from connexion import AioHttpApp, App
 
 logging.basicConfig(level=logging.DEBUG)
 
 TEST_FOLDER = pathlib.Path(__file__).parent
 FIXTURES_FOLDER = TEST_FOLDER / 'fixtures'
 SPEC_FOLDER = TEST_FOLDER / "fakeapi"
 SPECS = ["swagger.yaml", "openapi.yaml"]
+APPS = [App, AioHttpApp]
 ENCODING_STRINGS = [
     six.b("test"),
     six.u("test"),
@@ -21,6 +23,21 @@
 ]
 
 
+def get_apps_specs():
+    apps = [App]
+    if sys.version_info[0:2] >= (3, 5):
+        apps.append(AioHttpApp)
+
+    apps_specs = []
+    for app in apps:
+        for spec in SPECS:
+            apps_specs.append({"app_cls": app, "spec_file": spec})
+    return apps_specs
+
+
+APPS_SPECS = get_apps_specs()
+
+
 class FakeResponse(object):
     def __init__(self, status_code, text):
         """
@@ -101,86 +118,103 @@ def json_validation_spec_dir():
     return FIXTURES_FOLDER / 'json_validation'
 
 
-def build_app_from_fixture(api_spec_folder, spec_file='openapi.yaml', **kwargs):
+def build_app_from_fixture(
+    api_spec_folder,
+    app_cls=App,
+    spec_file='openapi.yaml',
+    **kwargs
+):
     debug = True
     if 'debug' in kwargs:
         debug = kwargs['debug']
         del (kwargs['debug'])
 
-    cnx_app = App(__name__,
-                  port=5001,
-                  specification_dir=FIXTURES_FOLDER / api_spec_folder,
-                  debug=debug)
+    cnx_app = app_cls(__name__,
+                      port=5001,
+                      specification_dir=FIXTURES_FOLDER / api_spec_folder,
+                      debug=debug)
 
     cnx_app.add_api(spec_file, **kwargs)
     cnx_app._spec_file = spec_file
     return cnx_app
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def simple_app(request):
-    return build_app_from_fixture('simple', request.param, validate_responses=True)
+    return build_app_from_fixture('simple',
+                                  validate_responses=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def snake_case_app(request):
-    return build_app_from_fixture('snake_case', request.param,
+    return build_app_from_fixture('snake_case',
                                   validate_responses=True,
-                                  pythonic_params=True)
+                                  pythonic_params=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def invalid_resp_allowed_app(request):
-    return build_app_from_fixture('simple', request.param,
-                                  validate_responses=False)
+    return build_app_from_fixture('simple',
+                                  validate_responses=False,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def strict_app(request):
-    return build_app_from_fixture('simple', request.param,
+    return build_app_from_fixture('simple',
                                   validate_responses=True,
-                                  strict_validation=True)
+                                  strict_validation=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def problem_app(request):
-    return build_app_from_fixture('problem', request.param,
-                                  validate_responses=True)
+    return build_app_from_fixture('problem',
+                                  validate_responses=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def schema_app(request):
-    return build_app_from_fixture('different_schemas', request.param,
-                                  validate_responses=True)
+    return build_app_from_fixture('different_schemas',
+                                  validate_responses=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def secure_endpoint_app(request):
-    return build_app_from_fixture('secure_endpoint', request.param,
-                                  validate_responses=True, pass_context_arg_name='req_context')
+    return build_app_from_fixture('secure_endpoint',
+                                  validate_responses=True,
+                                  pass_context_arg_name='req_context',
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def secure_api_app(request):
     options = {"swagger_ui": False}
-    return build_app_from_fixture('secure_api', request.param,
-                                  options=options, auth_all_paths=True)
+    return build_app_from_fixture('secure_api',
+                                  options=options,
+                                  auth_all_paths=True,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def unordered_definition_app(request):
-    return build_app_from_fixture('unordered_definition', request.param)
+    return build_app_from_fixture('unordered_definition', **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def bad_operations_app(request):
-    return build_app_from_fixture('bad_operations', request.param,
-                                  resolver_error=501)
+    return build_app_from_fixture('bad_operations',
+                                  resolver_error=501,
+                                  **request.param)
 
 
-@pytest.fixture(scope="session", params=SPECS)
+@pytest.fixture(scope="session", params=APPS_SPECS)
 def query_sanitazion(request):
-    return build_app_from_fixture('query_sanitazion', request.param)
+    return build_app_from_fixture('query_sanitazion', **request.param)
 
 
 if sys.version_info < (3, 5, 3) and sys.version_info[0] == 3:

tests/operations/test_validation.py → tests/operations/test_op_validation.py

@@ -1,9 +1,6 @@
 import pytest
-
-from connexion.operations.validation import (
-    BODY_TYPES,
-    validate_operation_output
-)
+from connexion.operations.validation import (BODY_TYPES,
+                                             validate_operation_output)
 
 
 @pytest.mark.parametrize("output", [

tests/test_json_validation.py

@@ -3,7 +3,7 @@
 from jsonschema.validators import _utils, extend
 
 import pytest
-from conftest import build_app_from_fixture, SPECS
+from conftest import SPECS, build_app_from_fixture
 from connexion import App
 from connexion.decorators.validation import RequestBodyValidator
 from connexion.json_schema import Draft4RequestValidator

tests/test_lifecycle.py

@@ -1,8 +1,8 @@
 import json
 
-import pytest
 import six
 
+import pytest
 from connexion.lifecycle import ConnexionResponse
 
 

tests/test_utils.py

@@ -1,8 +1,9 @@
 import math
 
+import six
+
 import connexion.apps
 import pytest
-import six
 from conftest import ENCODING_STRINGS
 from connexion import utils
 from mock import MagicMock