Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests #560

Merged
merged 2 commits into from
Jan 13, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
isort
  • Loading branch information
hjacobs committed Jan 13, 2018
commit 628d5bb18c4902476edff4746521ae57840298ad
2 changes: 1 addition & 1 deletion connexion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ def _required_lib(exec_info, *args, **kwargs):
Api = FlaskApi

# This version is replaced during release process.
__version__ = '2016.0.dev1'
__version__ = '1.3'
1 change: 1 addition & 0 deletions connexion/decorators/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import requests

from connexion.utils import get_function_from_name

from ..exceptions import OAuthProblem, OAuthResponseProblem, OAuthScopeProblem

logger = logging.getLogger('connexion.api.security')
Expand Down
6 changes: 3 additions & 3 deletions connexion/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from .decorators.parameter import parameter_to_arg
from .decorators.produces import BaseSerializer, Produces
from .decorators.response import ResponseValidator
from .decorators.security import (get_tokeninfo_url, security_passthrough,
verify_oauth_remote, verify_oauth_local,
get_tokeninfo_func)
from .decorators.security import (get_tokeninfo_func, get_tokeninfo_url,
security_passthrough, verify_oauth_local,
verify_oauth_remote)
from .decorators.validation import (ParameterValidator, RequestBodyValidator,
TypeValidationError)
from .exceptions import InvalidSpecification
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def readme():
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
Expand Down
9 changes: 6 additions & 3 deletions tests/decorators/test_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
import requests

import pytest
from connexion.decorators.security import get_tokeninfo_url, verify_oauth_remote, verify_oauth_local
from connexion.exceptions import OAuthProblem, OAuthScopeProblem, OAuthResponseProblem
from connexion.decorators.security import (get_tokeninfo_url,
verify_oauth_local,
verify_oauth_remote)
from connexion.exceptions import (OAuthProblem, OAuthResponseProblem,
OAuthScopeProblem)
from mock import MagicMock


Expand Down Expand Up @@ -121,4 +124,4 @@ def token_info(token):
wrapped_func(request)

tokeninfo["scope"].append("admin")
wrapped_func(request)
wrapped_func(request)
5 changes: 3 additions & 2 deletions tests/test_operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

import mock
import pytest

from connexion.apis.flask_api import Jsonifier
from connexion.decorators.security import security_passthrough, verify_oauth_remote, verify_oauth_local
from connexion.decorators.security import (security_passthrough,
verify_oauth_local,
verify_oauth_remote)
from connexion.exceptions import InvalidSpecification
from connexion.operation import Operation
from connexion.resolver import Resolver
Expand Down