diff --git a/python/tests/test_account.py b/python/tests/test_account.py index 17e5b725c..6034534af 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -531,9 +531,7 @@ class TestOnlineAccount: # rsa key gen can be slow especially on CI, adjust timeout ac1._evtracker.set_timeout(120) wait_configuration_progress(ac1, 1000) - ac1.start_threads() wait_configuration_progress(ac2, 1000) - ac2.start_threads() chat = self.get_chat(ac1, ac2, both_created=True) lp.sec("ac1: send unencrypted message to ac2") @@ -588,11 +586,8 @@ class TestOnlineAccount: ac1_clone = acfactory.clone_online_account(ac1) wait_configuration_progress(ac1, 1000) - ac1.start_threads() wait_configuration_progress(ac2, 1000) - ac2.start_threads() wait_configuration_progress(ac1_clone, 1000) - ac1_clone.start_threads() chat = self.get_chat(ac1, ac2) @@ -697,11 +692,9 @@ class TestOnlineAccount: lp.sec("ac2: waiting for configuration") wait_configuration_progress(ac2, 1000) - ac2.start_threads() lp.sec("ac1: waiting for configuration") wait_configuration_progress(ac1, 1000) - ac1.start_threads() lp.sec("ac1: send message and wait for ac2 to receive it") chat = self.get_chat(ac1, ac2) @@ -714,9 +707,7 @@ class TestOnlineAccount: ac1 = acfactory.get_online_configuring_account() ac2 = acfactory.get_online_configuring_account(mvbox=True, move=True) wait_configuration_progress(ac2, 1000) - ac2.start_threads() wait_configuration_progress(ac1, 1000) - ac1.start_threads() chat = self.get_chat(ac1, ac2) chat.send_text("message1") ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED") @@ -728,9 +719,7 @@ class TestOnlineAccount: ac1.set_config("bcc_self", "1") ac2 = acfactory.get_online_configuring_account() wait_configuration_progress(ac2, 1000) - ac2.start_threads() wait_configuration_progress(ac1, 1000) - ac1.start_threads() chat = self.get_chat(ac1, ac2) chat.send_text("message1") chat.send_text("message2") @@ -1110,7 +1099,6 @@ class TestOnlineAccount: def test_import_export_online_all(self, acfactory, tmpdir, lp): ac1 = acfactory.get_online_configuring_account() wait_configuration_progress(ac1, 1000) - ac1.start_threads() lp.sec("create some chat content") contact1 = ac1.create_contact("some1@hello.com", name="some1") @@ -1159,9 +1147,8 @@ class TestOnlineAccount: ac1 = acfactory.get_online_configuring_account() ac2 = acfactory.clone_online_account(ac1) wait_configuration_progress(ac2, 1000) - ac2.start_threads() wait_configuration_progress(ac1, 1000) - ac1.start_threads() + lp.sec("trigger ac setup message and return setupcode") assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"] setup_code = ac1.initiate_key_transfer() @@ -1184,9 +1171,7 @@ class TestOnlineAccount: ac2 = acfactory.clone_online_account(ac1) ac2._evtracker.set_timeout(30) wait_configuration_progress(ac2, 1000) - ac2.start_threads() wait_configuration_progress(ac1, 1000) - ac1.start_threads() lp.sec("trigger ac setup message but ignore") assert ac1.get_info()["fingerprint"] != ac2.get_info()["fingerprint"] @@ -1497,7 +1482,6 @@ class TestGroupStressTests: accounts = [acfactory.get_online_configuring_account() for i in range(5)] for acc in accounts: wait_configuration_progress(acc, 1000) - acc.start_threads() ac1 = accounts.pop() lp.sec("ac1: setting up contacts with 4 other members") @@ -1602,7 +1586,6 @@ class TestGroupStressTests: accounts = [acfactory.get_online_configuring_account() for i in range(3)] for acc in accounts: wait_configuration_progress(acc, 1000) - acc.start_threads() ac1 = accounts.pop() lp.sec("ac1: setting up contacts with 2 other members") diff --git a/python/tests/test_increation.py b/python/tests/test_increation.py index f480ea289..6fb96e1fe 100644 --- a/python/tests/test_increation.py +++ b/python/tests/test_increation.py @@ -23,9 +23,7 @@ class TestOnlineInCreation: ac1 = acfactory.get_online_configuring_account() ac2 = acfactory.get_online_configuring_account() wait_configuration_progress(ac1, 1000) - ac1.start_threads() wait_configuration_progress(ac2, 1000) - ac2.start_threads() c2 = ac1.create_contact(email=ac2.get_config("addr")) chat = ac1.create_chat_by_contact(c2) @@ -40,9 +38,7 @@ class TestOnlineInCreation: ac1 = acfactory.get_online_configuring_account() ac2 = acfactory.get_online_configuring_account() wait_configuration_progress(ac1, 1000) - ac1.start_threads() wait_configuration_progress(ac2, 1000) - ac2.start_threads() c2 = ac1.create_contact(email=ac2.get_config("addr")) chat = ac1.create_chat_by_contact(c2) @@ -60,9 +56,7 @@ class TestOnlineInCreation: ac1 = acfactory.get_online_configuring_account() ac2 = acfactory.get_online_configuring_account() wait_configuration_progress(ac1, 1000) - ac1.start_threads() wait_configuration_progress(ac2, 1000) - ac2.start_threads() c2 = ac1.create_contact(email=ac2.get_config("addr")) chat = ac1.create_chat_by_contact(c2)