From fdf599ef958046db91c6523626490f998dcb23da Mon Sep 17 00:00:00 2001 From: link2xt Date: Fri, 24 Mar 2023 09:45:11 +0000 Subject: [PATCH] python: do not use IDLE in test_markseen_message_and_mdn test Make the test less flaky in case Dovecot notifies only about EXISTS but not flag updates. --- python/tests/test_1_online.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/python/tests/test_1_online.py b/python/tests/test_1_online.py index 405374351..6040471ab 100644 --- a/python/tests/test_1_online.py +++ b/python/tests/test_1_online.py @@ -618,18 +618,25 @@ def test_markseen_message_and_mdn(acfactory, mvbox_move): # Do not send BCC to self, we only want to test MDN on ac1. ac1.set_config("bcc_self", "0") + acfactory.get_accepted_chat(ac1, ac2).send_text("hi") + msg = ac2._evtracker.wait_next_incoming_message() + + ac2.mark_seen_messages([msg]) + folder = "mvbox" if mvbox_move else "inbox" + if mvbox_move: + ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.") + ac2._evtracker.get_info_contains("Marked messages [0-9]+ in folder DeltaChat as seen.") + else: + ac1._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.") + ac2._evtracker.get_info_contains("Marked messages [0-9]+ in folder INBOX as seen.") ac1.direct_imap.select_config_folder(folder) ac2.direct_imap.select_config_folder(folder) - with ac1.direct_imap.idle() as idle1: - with ac2.direct_imap.idle() as idle2: - acfactory.get_accepted_chat(ac1, ac2).send_text("hi") - msg = ac2._evtracker.wait_next_incoming_message() - ac2.mark_seen_messages([msg]) - - idle2.wait_for_seen() # Check original message is marked as seen - idle1.wait_for_seen() # Check that the mdn is marked as seen + # Check that the mdn is marked as seen + assert len(list(ac1.direct_imap.conn.fetch(AND(seen=True)))) == 1 + # Check original message is marked as seen + assert len(list(ac2.direct_imap.conn.fetch(AND(seen=True)))) == 1 def test_reply_privately(acfactory):