encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 11:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update pytest (#6768)

Browse Source 
* Update pytest to 5.x

* Ensure test de-monkeypatches auth on failure

* Fix pytest.raises compat issue
This commit is contained in:
Ryan P Kilby 2019-06-30 19:08:52 -07:00 committed by GitHub
parent 82c2b5c3e7
commit c04d6eac43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/requirements-testing.txt
View File

@ -1,4 +1,4 @@
# Pytest for running the tests. # Pytest for running the tests.
pytest>=4.5.0,<4.6 pytest>=5.0,<5.1
pytest-django>=3.4.8,<3.5 pytest-django>=3.5.1,<3.6
pytest-cov>=2.7.1 pytest-cov>=2.7.1

12
tests/authentication/test_authentication.py
View File

@ -533,11 +533,13 @@ class BasicAuthenticationUnitTests(TestCase):
is_active = False is_active = False
old_authenticate = authentication.authenticate old_authenticate = authentication.authenticate
authentication.authenticate = lambda **kwargs: MockUser() authentication.authenticate = lambda **kwargs: MockUser()
auth = authentication.BasicAuthentication() try:
with pytest.raises(exceptions.AuthenticationFailed) as error: auth = authentication.BasicAuthentication()
auth.authenticate_credentials('foo', 'bar') with pytest.raises(exceptions.AuthenticationFailed) as exc_info:
assert 'User inactive or deleted.' in str(error) auth.authenticate_credentials('foo', 'bar')
authentication.authenticate = old_authenticate assert 'User inactive or deleted.' in str(exc_info.value)
finally:
authentication.authenticate = old_authenticate
@override_settings(ROOT_URLCONF=__name__, @override_settings(ROOT_URLCONF=__name__,