From 529beafef6f2b3fc5ffd5b95b9bee2b1f645f0a5 Mon Sep 17 00:00:00 2001 From: Benjamin Wohlwend Date: Thu, 12 Apr 2018 11:49:18 +0200 Subject: [PATCH] make sure to close client in django fixtures This fixes an issue with the test suite hanging for several seconds after finishing, waiting for the timer thread to trigger (also pinned Logbook as the newly released version breaks with gevent for some reason, will investigate later) --- tests/contrib/django/fixtures.py | 2 ++ tests/requirements/requirements-base.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/contrib/django/fixtures.py b/tests/contrib/django/fixtures.py index 4c9fb6010..e0466440a 100644 --- a/tests/contrib/django/fixtures.py +++ b/tests/contrib/django/fixtures.py @@ -28,6 +28,7 @@ def django_elasticapm_client(request): instrument(client) app.client = client yield client + client.close() app.client = old_client @@ -53,6 +54,7 @@ def django_sending_elasticapm_client(request, validating_httpserver): app.client = client client.httpserver = validating_httpserver yield client + client.close() app.client = old_client diff --git a/tests/requirements/requirements-base.txt b/tests/requirements/requirements-base.txt index 34da19ea5..80afb0626 100644 --- a/tests/requirements/requirements-base.txt +++ b/tests/requirements/requirements-base.txt @@ -17,7 +17,7 @@ statistics==1.0.3.5 urllib3 certifi Jinja2 -Logbook +Logbook==1.3.0 MarkupSafe WebOb Werkzeug