Skip to content

Commit

Permalink
Merge pull request #10 from sjaensch/fix-pytest4-compatibility
Browse files Browse the repository at this point in the history
Fix pytest 4 compatibility, don't call fixture functions from code
  • Loading branch information
sjaensch committed Nov 16, 2018
2 parents d9936a4 + 7a4dd94 commit d3f1eb7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/client/conftest.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pytest
from bravado_core.spec import Spec

from aiobravado.client import Spec
from aiobravado.client import SwaggerClient


Expand Down
8 changes: 7 additions & 1 deletion tests/client/construct_request_test.py
Expand Up @@ -3,12 +3,18 @@
from bravado_core.operation import Operation
from bravado_core.request import IncomingRequest
from bravado_core.request import unmarshal_request
from bravado_core.spec import Spec
from mock import mock
from mock import patch

from aiobravado.client import CallableOperation
from aiobravado.client import construct_request
from tests.client.conftest import minimal_swagger_spec as build_swagger_spec


def build_swagger_spec(swagger_dict):
spec = Spec(swagger_dict)
spec.api_url = 'http://localhost/'
return spec


@pytest.mark.parametrize('timeout_kv', [
Expand Down

0 comments on commit d3f1eb7

Please sign in to comment.