Skip to content

Avoid deprecation warnings on pytest 3.0 #393

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

Merged
merged 6 commits into from
Nov 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions pytest_django/compat.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file cannot be imported from until Django sets up

try:
# Django 1.11
from django.test.utils import setup_databases, teardown_databases # noqa
Expand Down
5 changes: 3 additions & 2 deletions pytest_django/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from . import live_server_helper

from .django_compat import is_django_unittest
from .pytest_compat import getfixturevalue

from .lazy_django import get_django_version, skip_if_no_django

Expand Down Expand Up @@ -154,7 +155,7 @@ def db(request, django_db_setup, django_db_blocker):
"""
if 'transactional_db' in request.funcargnames \
or 'live_server' in request.funcargnames:
request.getfuncargvalue('transactional_db')
getfixturevalue(request, 'transactional_db')
else:
_django_db_fixture_helper(False, request, django_db_blocker)

Expand Down Expand Up @@ -322,4 +323,4 @@ def _live_server_helper(request):
function-scoped.
"""
if 'live_server' in request.funcargnames:
request.getfuncargvalue('transactional_db')
getfixturevalue(request, 'transactional_db')
9 changes: 5 additions & 4 deletions pytest_django/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from .fixtures import rf # noqa
from .fixtures import settings # noqa
from .fixtures import transactional_db # noqa
from .pytest_compat import getfixturevalue

from .lazy_django import (django_settings_is_configured,
get_django_version, skip_if_no_django)
Expand Down Expand Up @@ -370,17 +371,17 @@ def _django_db_marker(request):
if marker:
validate_django_db(marker)
if marker.transaction:
request.getfuncargvalue('transactional_db')
getfixturevalue(request, 'transactional_db')
else:
request.getfuncargvalue('db')
getfixturevalue(request, 'db')


@pytest.fixture(autouse=True, scope='class')
def _django_setup_unittest(request, django_db_blocker):
"""Setup a django unittest, internal to pytest-django."""
if django_settings_is_configured() and is_django_unittest(request):
request.getfuncargvalue('django_test_environment')
request.getfuncargvalue('django_db_setup')
getfixturevalue(request, 'django_test_environment')
getfixturevalue(request, 'django_db_setup')

django_db_blocker.unblock()

Expand Down
5 changes: 5 additions & 0 deletions pytest_django/pytest_compat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
def getfixturevalue(request, value):
if hasattr(request, 'getfixturevalue'):
return request.getfixturevalue(value)

return request.getfuncargvalue(value)
5 changes: 3 additions & 2 deletions tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from django.db import connection
from django.test.testcases import connections_support_transactions

from pytest_django.pytest_compat import getfixturevalue
from pytest_django_test.app.models import Item


Expand Down Expand Up @@ -33,9 +34,9 @@ class TestDatabaseFixtures:
@pytest.fixture(params=['db', 'transactional_db'])
def both_dbs(self, request):
if request.param == 'transactional_db':
return request.getfuncargvalue('transactional_db')
return getfixturevalue(request, 'transactional_db')
elif request.param == 'db':
return request.getfuncargvalue('db')
return getfixturevalue(request, 'db')

def test_access(self, both_dbs):
Item.objects.create(name='spam')
Expand Down