Projet

Général

Profil

0001-tests_multitenant-do-not-presume-duration-of-test-29.patch

Benjamin Dauvergne, 15 janvier 2019 21:09

Télécharger (1,85 ko)

Voir les différences:

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(-)
tests_multitenant/test_request_context_filter.py
1 1
import pytest
2 2

  
3
import time
3 4
import logging
4 5

  
5 6
from hobo.logger import RequestContextFilter
......
56 57

  
57 58

  
58 59
def test_systemd(settings, tenants, client, journald_handler):
60
    from systemd.journal import Reader
61

  
59 62
    root_logger = logging.getLogger()
60 63
    assert len(root_logger.handlers) == 2
61 64
    journald_handler.addFilter(RequestContextFilter())
......
68 71
            user.save()
69 72
            user.saml_identifiers.create(name_id='ab' * 16, issuer='https://idp.example.com')
70 73

  
74
    start = time.time()
75

  
71 76
    for tenant in tenants:
72 77
        settings.ALLOWED_HOSTS.append(tenant.domain_url)
73 78
        with tenant_context(tenant):
......
75 80
        client.get('/', SERVER_NAME=tenant.domain_url,
76 81
                   HTTP_X_FORWARDED_FOR='99.99.99.99, 127.0.0.1')
77 82

  
78
    from systemd.journal import Reader
79
    import time
80

  
81 83
    reader = Reader()
82
    reader.seek_realtime(time.time() - 10)
84
    reader.seek_realtime(start - 1)
83 85
    records = [l for l in reader if l['MESSAGE'] == 'wat!']
84 86
    assert len(records) == 2
85 87
    for tenant, record in zip(tenants, records):
86
-