From f017ffa0b3671b9787e36d5c4974280fcb852e69 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sat, 16 May 2020 17:01:46 +0300 Subject: [PATCH] Cleanup test_autodelete_timer() Better comments and removed unnecessary .consume_events() --- python/tests/test_account.py | 38 +++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/python/tests/test_account.py b/python/tests/test_account.py index f1c1719fd..b0b8ab49a 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -1480,37 +1480,39 @@ class TestOnlineAccount: chat1 = self.get_chat(ac1, ac2) chat2 = self.get_chat(ac2, ac1) + lp.sec("ac1: set autodelete timer to 60") chat1.set_autodelete_timer(60) + lp.sec("ac1: check that autodelete timer is set for chat") assert chat1.get_autodelete_timer() == 60 - d = chat1.get_summary() - assert d["autodelete_timer"] == 60 + chat1_summary = chat1.get_summary() + assert chat1_summary["autodelete_timer"] == 60 + lp.sec("ac2: receive system message about autodelete timer modification") ac2._evtracker.get_matching("DC_EVENT_CHAT_AUTODELETE_TIMER_MODIFIED") - ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG") - msg_in = ac2.get_message_by_id(ev.data2) + incoming_message_event1 = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG") + system_message1 = ac2.get_message_by_id(incoming_message_event1.data2) assert chat2.get_autodelete_timer() == 60 - assert msg_in.is_system_message() - assert "Autodelete timer: 60\n" in msg_in.get_message_info() - - ac1._evtracker.consume_events() - ac2._evtracker.consume_events() + assert system_message1.is_system_message() + assert "Autodelete timer: 60\n" in system_message1.get_message_info() lp.sec("ac2: send message to ac1") chat2.send_text("message") lp.sec("ac1: waiting for message from ac2") - ev = ac1._evtracker.get_matching("DC_EVENT_INCOMING_MSG") - msg_in = ac1.get_message_by_id(ev.data2) - assert msg_in.text == "message" - assert msg_in.is_encrypted() - assert "Autodelete timer: 60\n" in msg_in.get_message_info() + incoming_message_event2 = ac1._evtracker.get_matching("DC_EVENT_INCOMING_MSG") + text_message = ac1.get_message_by_id(incoming_message_event2.data2) + assert text_message.text == "message" + assert text_message.is_encrypted() + assert "Autodelete timer: 60\n" in text_message.get_message_info() - # Reset the timer back to 0 + lp.sec("ac2: set autodelete timer to 0") chat2.set_autodelete_timer(0) + + lp.sec("ac1: receive system message about autodelete timer modification") ac1._evtracker.get_matching("DC_EVENT_CHAT_AUTODELETE_TIMER_MODIFIED") - ev = ac1._evtracker.get_matching("DC_EVENT_INCOMING_MSG") - msg_in = ac1.get_message_by_id(ev.data2) - assert "Autodelete timer: " not in msg_in.get_message_info() + incoming_message_event3 = ac1._evtracker.get_matching("DC_EVENT_INCOMING_MSG") + system_message2 = ac1.get_message_by_id(incoming_message_event3.data2) + assert "Autodelete timer: " not in system_message2.get_message_info() assert chat1.get_autodelete_timer() == 0