Skip to content

Commit e2d76ef

Browse files
committed
updated pytest and dependencies to newest versions (#211)
with a bit of luck, this will resolve occasional test failures due to a threading lock issue in pytest-catchlog (which has been integrated into pytest proper) closes #211 Signed-off-by: Benjamin Wohlwend <[email protected]>
1 parent 49ae2c8 commit e2d76ef

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

tests/contrib/django/django_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,7 @@ def test_django_logging_middleware(django_elasticapm_client, client):
901901
logger = logging.getLogger('logmiddleware')
902902
logger.handlers = []
903903
logger.addHandler(handler)
904+
logger.level = logging.INFO
904905

905906
with override_settings(**middleware_setting(django.VERSION,
906907
['elasticapm.contrib.django.middleware.LogMiddleware'])):

tests/handlers/logging/logging_tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def logger(elasticapm_client):
1515
logger.handlers = []
1616
logger.addHandler(handler)
1717
logger.client = elasticapm_client
18+
logger.level = logging.INFO
1819
return logger
1920

2021

tests/requirements/requirements-base.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
py==1.4.34
2-
pytest==3.2.4
3-
pytest-catchlog==1.2.2
4-
pytest-django==3.1.2
5-
coverage==4.4.2
1+
pytest==3.6.2
2+
py==1.5.3
3+
more-itertools==4.1.0
4+
pluggy==0.6.0
5+
pytest-django==3.3.2
6+
atomicwrites==1.1.5
7+
coverage==4.5.1
68
pytest-cov==2.5.1
79
pytest-localserver==0.4.1
810
pytest-mock==1.6.3

0 commit comments

Comments
 (0)