Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

python tests: remove peek_online_config()

Browse Source 
Using peek_online_config() results in a message being sent to some
other account, used by previous test. If tests are run in parallel,
for example with pytest-xdist, we could be sending a message to a still
online DC client.
This commit is contained in:
Alexander Krotov
2020-02-09 23:20:23 +03:00
committed by holger krekel
parent cabb58a9aa
commit c4d5f657da
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/tests/conftest.py
View File

@@ -194,11 +194,6 @@ def acfactory(pytestconfig, tmpdir, request, session_liveconfig, datadir):
lib.dc_set_config(ac._dc_context, b"configured", b"1") lib.dc_set_config(ac._dc_context, b"configured", b"1")
return ac return ac
def peek_online_config(self):
if not session_liveconfig:
pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")
return session_liveconfig.get(self.live_count)
def get_online_config(self, pre_generated_key=True): def get_online_config(self, pre_generated_key=True):
if not session_liveconfig: if not session_liveconfig:
pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig") pytest.skip("specify DCC_PY_LIVECONFIG or --liveconfig")

25
python/tests/test_account.py
View File

@@ -7,7 +7,6 @@ from deltachat import const, Account
from deltachat.message import Message from deltachat.message import Message
from datetime import datetime, timedelta from datetime import datetime, timedelta
from conftest import (wait_configuration_progress, from conftest import (wait_configuration_progress,
wait_successful_IMAP_SMTP_connection,
wait_securejoin_inviter_progress) wait_securejoin_inviter_progress)
@@ -448,37 +447,31 @@ class TestOnlineAccount:
ac1.import_self_keys(dir.strpath) ac1.import_self_keys(dir.strpath)
def test_one_account_send_bcc_setting(self, acfactory, lp): def test_one_account_send_bcc_setting(self, acfactory, lp):
ac1 = acfactory.get_online_configuring_account() ac1, ac2 = acfactory.get_two_online_accounts()
ac2_config = acfactory.peek_online_config() chat = self.get_chat(ac1, ac2)
c2 = ac1.create_contact(email=ac2_config["addr"])
chat = ac1.create_chat_by_contact(c2)
assert chat.id > const.DC_CHAT_ID_LAST_SPECIAL
wait_successful_IMAP_SMTP_connection(ac1)
wait_configuration_progress(ac1, 1000)
lp.sec("ac1: setting bcc_self=1") lp.sec("ac1: setting bcc_self=1")
ac1.set_config("bcc_self", "1") ac1.set_config("bcc_self", "1")
self_addr = ac1.get_config("addr")
other_addr = ac2.get_config("addr")
lp.sec("send out message with bcc to ourselves") lp.sec("send out message with bcc to ourselves")
msg_out = chat.send_text("message2") msg_out = chat.send_text("message1")
ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
assert ev[2] == msg_out.id
# wait for send out (BCC) # wait for send out (BCC)
assert ac1.get_config("bcc_self") == "1" assert ac1.get_config("bcc_self") == "1"
self_addr = ac1.get_config("addr")
ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT") ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
assert self_addr in ev[2] assert self_addr in ev[2]
assert other_addr in ev[2]
ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE") ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
ac1._evlogger.consume_events() ac1._evlogger.consume_events()
lp.sec("send out message without bcc") lp.sec("send out message without bcc")
ac1.set_config("bcc_self", "0") ac1.set_config("bcc_self", "0")
msg_out = chat.send_text("message3") msg_out = chat.send_text("message2")
assert not msg_out.is_forwarded()
ev = ac1._evlogger.get_matching("DC_EVENT_MSGS_CHANGED")
assert ev[2] == msg_out.id
ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT") ev = ac1._evlogger.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
assert self_addr not in ev[2] assert self_addr not in ev[2]
assert other_addr in ev[2]
ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE") ev = ac1._evlogger.get_matching("DC_EVENT_DELETED_BLOB_FILE")
def test_send_file_twice_unicode_filename_mangling(self, tmpdir, acfactory, lp): def test_send_file_twice_unicode_filename_mangling(self, tmpdir, acfactory, lp):