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.

Sign up for GitHub

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

Don't call pytest fixture functions from code anymore #396

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Don't call pytest fixture functions from code anymore #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tests/client/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import pytest
from bravado_core.spec import Spec

from bravado.client import Spec
from bravado.client import SwaggerClient


Expand Down
8 changes: 7 additions & 1 deletion tests/client/construct_request_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
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 bravado.client import CallableOperation
from bravado.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