From 603a687a7fcbeed47ade90b44e9f0ea07dfa1ea6 Mon Sep 17 00:00:00 2001 From: woutdenolf Date: Sat, 28 Nov 2020 18:45:16 +0100 Subject: [PATCH] test_setup_logging: give the logserver some time --- tests/session/test_setup_logging.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/session/test_setup_logging.py b/tests/session/test_setup_logging.py index 1d97a27ad4..9a687a963e 100644 --- a/tests/session/test_setup_logging.py +++ b/tests/session/test_setup_logging.py @@ -7,6 +7,7 @@ import os import pytest +import gevent from bliss.scanning.scan_saving import set_scan_saving_class @@ -92,11 +93,21 @@ def check_user_logging(capsys, elog_offline=False): def check_beacon_logging(caplog, logfile): + # Get lines from logging capture records = caplog.get_records("setup") - with open(logfile, "r") as f: - lines = [l.rstrip() for l in f] assert len(records) == 3, records - assert len(lines) == 3, lines + + # Get lines from the log server file + try: + lines = [] + with gevent.Timeout(10): + while len(lines) != 3: + with open(logfile, "r") as f: + lines = [l.rstrip() for l in f] + gevent.sleep(0.5) + except gevent.Timeout: + assert len(lines) == 3, lines + expected = "LogInitController: Beacon error" assert records[0].levelname == "ERROR" assert records[0].message == expected -- GitLab