From 9f8671750eb29decc4ae9c94cba57c78d599f760 Mon Sep 17 00:00:00 2001 From: Anastasiya Semenkevich Date: Thu, 28 Mar 2024 12:40:30 +0300 Subject: [PATCH] chore: remove parametrization where it is not in use in fact --- .../communities/test_communities_pin_and_unpin_messages.py | 2 +- tests/messages/test_1x1_chat.py | 7 ++----- tests/messages/test_messaging_group_chat.py | 4 ++-- tests/online_identifier/test_online_identifier.py | 7 ++----- .../test_messaging_settings_accept_request.py | 7 ++----- .../test_messaging_settings_identity_verification.py | 7 ++----- .../test_messaging_settings_reject_request.py | 7 ++----- 7 files changed, 13 insertions(+), 28 deletions(-) diff --git a/tests/communities/test_communities_pin_and_unpin_messages.py b/tests/communities/test_communities_pin_and_unpin_messages.py index 5fcf4a8..0dfdb4c 100644 --- a/tests/communities/test_communities_pin_and_unpin_messages.py +++ b/tests/communities/test_communities_pin_and_unpin_messages.py @@ -35,7 +35,7 @@ def test_join_community_and_pin_unpin_message(multiple_instances, user_data_one, community_params['name'] = f'{datetime.now():%d%m%Y_%H%M%S}' main_screen = MainWindow() - with multiple_instances(user_data_one) as aut_one, multiple_instances(user_data_two) as aut_two: + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() diff --git a/tests/messages/test_1x1_chat.py b/tests/messages/test_1x1_chat.py index ecfaa36..7244729 100644 --- a/tests/messages/test_1x1_chat.py +++ b/tests/messages/test_1x1_chat.py @@ -20,17 +20,14 @@ pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703087', '1-1 Chat') @pytest.mark.case(703087) -@pytest.mark.parametrize('user_data_one, user_data_two', [ - (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') -]) -def test_1x1_chat(multiple_instances, user_data_one, user_data_two): +def test_1x1_chat(multiple_instances): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two main_window = MainWindow() messages_screen = MessagesScreen() emoji = 'sunglasses' - with (multiple_instances() as aut_one, multiple_instances() as aut_two): + with multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() diff --git a/tests/messages/test_messaging_group_chat.py b/tests/messages/test_messaging_group_chat.py index 23a454f..70c92e9 100644 --- a/tests/messages/test_messaging_group_chat.py +++ b/tests/messages/test_messaging_group_chat.py @@ -37,8 +37,8 @@ def test_group_chat(multiple_instances, user_data_one, user_data_two, user_data_ main_window = MainWindow() messages_screen = MessagesScreen() - with multiple_instances(user_data_one) as aut_one, multiple_instances(user_data_two) as aut_two, multiple_instances( - user_data_three) as aut_three: + with multiple_instances(user_data=user_data_one) as aut_one, multiple_instances(user_data=user_data_two) as aut_two, multiple_instances( + user_data=user_data_three) as aut_three: with step(f'Launch multiple instances with authorized users {user_one.name}, {user_two.name}, {user_three}'): for aut, account in zip([aut_one, aut_two, aut_three], [user_one, user_two, user_three]): aut.attach() diff --git a/tests/online_identifier/test_online_identifier.py b/tests/online_identifier/test_online_identifier.py index 9f72bc0..62def19 100644 --- a/tests/online_identifier/test_online_identifier.py +++ b/tests/online_identifier/test_online_identifier.py @@ -41,17 +41,14 @@ def test_change_own_display_name(main_screen: MainWindow, user_account, new_name @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703003', 'Switch state to online') @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703004', 'Switch state to automatic') @pytest.mark.case(703002, 703003, 703004) -@pytest.mark.parametrize('user_data_one, user_data_two', [ - (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') -]) -def test_switch_state_to_offline_online_automatic(multiple_instances, user_data_one, user_data_two): +def test_switch_state_to_offline_online_automatic(multiple_instances): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two community_params = deepcopy(constants.community_params) community_params['name'] = f'{datetime.now():%d%m%Y_%H%M%S}' main_screen = MainWindow() - with multiple_instances() as aut_one, multiple_instances() as aut_two: + with multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() diff --git a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py index cfa9a3d..3d8643e 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py +++ b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py @@ -15,16 +15,13 @@ pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703011', 'Add a contact with a chat key') @pytest.mark.case(703011) -@pytest.mark.parametrize('user_data_one, user_data_two', [ - (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') -]) # TODO: reason='https://github.com/status-im/desktop-qa-automation/issues/346' -def test_messaging_settings_accepting_request(multiple_instances, user_data_one, user_data_two): +def test_messaging_settings_accepting_request(multiple_instances): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two main_window = MainWindow() - with (multiple_instances() as aut_one, multiple_instances() as aut_two): + with (multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two): with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() diff --git a/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py b/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py index 708a263..26285fe 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py +++ b/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py @@ -16,15 +16,12 @@ pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704611', 'Reply to identity request') @pytest.mark.case(704611) -@pytest.mark.parametrize('user_data_one, user_data_two', [ - (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') -]) -def test_messaging_settings_identity_verification(multiple_instances, user_data_one, user_data_two): +def test_messaging_settings_identity_verification(multiple_instances): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two main_window = MainWindow() - with multiple_instances() as aut_one, multiple_instances() as aut_two: + with multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach() diff --git a/tests/settings/settings_messaging/test_messaging_settings_reject_request.py b/tests/settings/settings_messaging/test_messaging_settings_reject_request.py index 04fec71..df49be2 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_reject_request.py +++ b/tests/settings/settings_messaging/test_messaging_settings_reject_request.py @@ -13,15 +13,12 @@ pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704610', 'Reject a contact request with a chat key') @pytest.mark.case(704610) -@pytest.mark.parametrize('user_data_one, user_data_two', [ - (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') -]) -def test_messaging_settings_rejecting_request(multiple_instances, user_data_one, user_data_two): +def test_messaging_settings_rejecting_request(multiple_instances): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two main_window = MainWindow() - with multiple_instances() as aut_one, multiple_instances() as aut_two: + with multiple_instances(user_data=None) as aut_one, multiple_instances(user_data=None) as aut_two: with step(f'Launch multiple instances with authorized users {user_one.name} and {user_two.name}'): for aut, account in zip([aut_one, aut_two], [user_one, user_two]): aut.attach()