From 5f5de8d8943a1fd09e8e20dc1fd83bc17a4239a1 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 15 Jan 2019 21:09:10 +0100 Subject: [PATCH] tests_multitenant: do not presume duration of test (#29786) --- tests_multitenant/test_request_context_filter.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests_multitenant/test_request_context_filter.py b/tests_multitenant/test_request_context_filter.py index 4e00fcf..7b5c31f 100644 --- a/tests_multitenant/test_request_context_filter.py +++ b/tests_multitenant/test_request_context_filter.py @@ -1,5 +1,6 @@ import pytest +import time import logging from hobo.logger import RequestContextFilter @@ -56,6 +57,8 @@ def journald_handler(): def test_systemd(settings, tenants, client, journald_handler): + from systemd.journal import Reader + root_logger = logging.getLogger() assert len(root_logger.handlers) == 2 journald_handler.addFilter(RequestContextFilter()) @@ -68,6 +71,8 @@ def test_systemd(settings, tenants, client, journald_handler): user.save() user.saml_identifiers.create(name_id='ab' * 16, issuer='https://idp.example.com') + start = time.time() + for tenant in tenants: settings.ALLOWED_HOSTS.append(tenant.domain_url) with tenant_context(tenant): @@ -75,11 +80,8 @@ def test_systemd(settings, tenants, client, journald_handler): client.get('/', SERVER_NAME=tenant.domain_url, HTTP_X_FORWARDED_FOR='99.99.99.99, 127.0.0.1') - from systemd.journal import Reader - import time - reader = Reader() - reader.seek_realtime(time.time() - 10) + reader.seek_realtime(start - 1) records = [l for l in reader if l['MESSAGE'] == 'wat!'] assert len(records) == 2 for tenant, record in zip(tenants, records): -- 2.20.1