From fd10652f48f2d2aeef1fc059edb6523e0e006ea5 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 11 Dec 2023 16:56:28 +0100 Subject: [PATCH] fix event waiting in a test --- chatmaild/src/chatmaild/config.py | 4 +++- tests/online/test_2_deltachat.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index 2d558417..16bb14a8 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -27,7 +27,9 @@ def write_initial_config(inipath, mail_domain): from importlib.resources import files inidir = files(__package__).joinpath("ini") - content = inidir.joinpath("chatmail.ini.f").read_text().format(mail_domain=mail_domain) + content = ( + inidir.joinpath("chatmail.ini.f").read_text().format(mail_domain=mail_domain) + ) if mail_domain.endswith(".testrun.org"): override_inipath = inidir.joinpath("override-testrun.ini") privacy = iniconfig.IniConfig(override_inipath)["privacy"] diff --git a/tests/online/test_2_deltachat.py b/tests/online/test_2_deltachat.py index c1802704..6364e35a 100644 --- a/tests/online/test_2_deltachat.py +++ b/tests/online/test_2_deltachat.py @@ -91,9 +91,9 @@ class TestEndToEndDeltaChat: lp.sec("setup encrypted comms between ac1 and ac2 on different instances") qr = ac1.get_setup_contact_qr() - ac2.qr_setup_contact(qr) - msg = ac2.wait_next_incoming_message() - assert "verified" in msg.text + ch = ac2.qr_setup_contact(qr) + assert ch.id >= 10 + ac1._evtracker.wait_securejoin_inviter_progress(1000) lp.sec("ac1 sends a message and ac2 marks it as seen") chat = ac1.create_chat(ac2)