diff --git a/test/e2e/pytest.ini b/test/e2e/pytest.ini index 7d1fb44b2e..35e05c26b7 100644 --- a/test/e2e/pytest.ini +++ b/test/e2e/pytest.ini @@ -10,3 +10,15 @@ addopts = --disable-warnings -p no:logging markers = smoke: Smoke tests self: Framework self-tests + critical: Critical checks for every PR + settings_all: All tests related to the settings + settings_keycard: Tests related to Keycard settings settings + settings_messaging: Tests related to messaging settings + settings_profile: Tests related to profile settings + settings_wallet: Tests related to wallet settings + messaging: All tests related to 1x1 chat and group chat functionality + communities: All tests related to communities functionality + onboarding: All tests related to onboarding + keycard: All tests related to Keycard functionality + wallet: All tests related to wallet functionality + diff --git a/test/e2e/tests/communities/__init__.py b/test/e2e/tests/communities/__init__.py index e69de29bb2..f98414217e 100644 --- a/test/e2e/tests/communities/__init__.py +++ b/test/e2e/tests/communities/__init__.py @@ -0,0 +1,3 @@ +import pytest + +marks = pytest.mark.communities diff --git a/test/e2e/tests/communities/test_airdrops.py b/test/e2e/tests/communities/test_airdrops.py index aa02aa6c3c..0a7c650515 100644 --- a/test/e2e/tests/communities/test_airdrops.py +++ b/test/e2e/tests/communities/test_airdrops.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import constants from constants.community_settings import AirdropsElements @@ -8,6 +9,7 @@ from constants.images_paths import AIRDROPS_WELCOME_IMAGE_PATH from gui.main_window import MainWindow from scripts.tools import image +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703200', 'Manage community: Manage Airdrops screen overview') diff --git a/test/e2e/tests/communities/test_communities.py b/test/e2e/tests/communities/test_communities.py index a04f8277b4..32ac08432b 100644 --- a/test/e2e/tests/communities/test_communities.py +++ b/test/e2e/tests/communities/test_communities.py @@ -3,11 +3,13 @@ from datetime import datetime import allure import pytest from allure_commons._allure import step +from . import marks import configs.testpath import constants from gui.main_window import MainWindow +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703084', 'Create community') @pytest.mark.case(703084) diff --git a/test/e2e/tests/communities/test_permissions.py b/test/e2e/tests/communities/test_permissions.py index 7170024c45..74c9f9c0f6 100644 --- a/test/e2e/tests/communities/test_permissions.py +++ b/test/e2e/tests/communities/test_permissions.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -8,6 +9,7 @@ from constants.community_settings import PermissionsElements from constants.images_paths import PERMISSION_WELCOME_IMAGE_PATH from gui.main_window import MainWindow +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703198', diff --git a/test/e2e/tests/communities/test_tokens.py b/test/e2e/tests/communities/test_tokens.py index abf74964a7..8b38b94e52 100644 --- a/test/e2e/tests/communities/test_tokens.py +++ b/test/e2e/tests/communities/test_tokens.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import constants from constants.community_settings import TokensElements @@ -8,6 +9,7 @@ from constants.images_paths import TOKENS_WELCOME_IMAGE_PATH from gui.main_window import MainWindow from scripts.tools import image +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703199', 'Manage community: Manage Mint Tokens screen overview') diff --git a/test/e2e/tests/messages/__init__.py b/test/e2e/tests/messages/__init__.py index e69de29bb2..76d6db9598 100644 --- a/test/e2e/tests/messages/__init__.py +++ b/test/e2e/tests/messages/__init__.py @@ -0,0 +1,3 @@ +import pytest + +marks = pytest.mark.messaging diff --git a/test/e2e/tests/messages/test_messaging_group_chat.py b/test/e2e/tests/messages/test_messaging_group_chat.py index 11a3de9fb3..b97cef6ec8 100644 --- a/test/e2e/tests/messages/test_messaging_group_chat.py +++ b/test/e2e/tests/messages/test_messaging_group_chat.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs.testpath import constants @@ -9,6 +10,7 @@ from constants.messaging import Messaging from gui.main_window import MainWindow from gui.screens.messages import MessagesScreen +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703014', 'Create a group and send messages') @pytest.mark.case(703014) diff --git a/test/e2e/tests/onboarding/__init__.py b/test/e2e/tests/onboarding/__init__.py index e69de29bb2..17b7706ab1 100644 --- a/test/e2e/tests/onboarding/__init__.py +++ b/test/e2e/tests/onboarding/__init__.py @@ -0,0 +1,3 @@ +import pytest + +marks = pytest.mark.onboarding diff --git a/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py b/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py index 178ad0dddd..2b25ebee4a 100755 --- a/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py +++ b/test/e2e/tests/onboarding/test_onboarding_generate_new_keys.py @@ -4,6 +4,7 @@ import os import allure import pytest from allure import step +from . import marks import configs.timeouts from gui.components.onboarding.before_started_popup import BeforeStartedPopUp @@ -12,6 +13,7 @@ from gui.components.picture_edit_popup import shift_image from gui.components.splash_screen import SplashScreen from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, BiometricsView, KeysView +pytestmark = marks LOG = logging.getLogger(__name__) diff --git a/test/e2e/tests/onboarding/test_onboarding_import_seed.py b/test/e2e/tests/onboarding/test_onboarding_import_seed.py index 1e0f0f471a..26114b42e4 100644 --- a/test/e2e/tests/onboarding/test_onboarding_import_seed.py +++ b/test/e2e/tests/onboarding/test_onboarding_import_seed.py @@ -3,6 +3,7 @@ import os import allure import pytest from allure_commons._allure import step +from . import marks import configs.system import constants @@ -14,6 +15,7 @@ from gui.main_window import LeftPanel from gui.mocked_keycard_controller import MockedKeycardController from gui.screens.onboarding import BiometricsView, AllowNotificationsView, WelcomeToStatusView, KeysView +pytestmark = marks @pytest.fixture def keys_screen(main_window) -> KeysView: diff --git a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py index 21121adf04..c92e12581d 100644 --- a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py +++ b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py @@ -4,6 +4,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import configs.system import constants @@ -15,6 +16,7 @@ from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.splash_screen import SplashScreen from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, KeysView, BiometricsView, LoginView +pytestmark = marks @pytest.fixture def keys_screen(main_window) -> KeysView: diff --git a/test/e2e/tests/onboarding/test_onboarding_syncing.py b/test/e2e/tests/onboarding/test_onboarding_syncing.py index dbae074ad2..78b0dc0af0 100644 --- a/test/e2e/tests/onboarding/test_onboarding_syncing.py +++ b/test/e2e/tests/onboarding/test_onboarding_syncing.py @@ -4,6 +4,7 @@ import allure import pyperclip import pytest from allure_commons._allure import step +from . import marks import configs.testpath import constants @@ -19,6 +20,7 @@ from gui.main_window import MainWindow from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, SyncResultView, \ SyncCodeView, SyncDeviceFoundView +pytestmark = marks @pytest.fixture def sync_screen(main_window) -> SyncCodeView: diff --git a/test/e2e/tests/onboarding/test_password_strength.py b/test/e2e/tests/onboarding/test_password_strength.py index 5113f0874b..809d793dc2 100644 --- a/test/e2e/tests/onboarding/test_password_strength.py +++ b/test/e2e/tests/onboarding/test_password_strength.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs.system import constants @@ -9,6 +10,7 @@ from constants.onboarding import very_weak_lower_elements, very_weak_upper_eleme from gui.components.onboarding.before_started_popup import BeforeStartedPopUp from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, KeysView +pytestmark = marks @pytest.fixture def keys_screen(main_window) -> KeysView: diff --git a/test/e2e/tests/settings/__init__.py b/test/e2e/tests/settings/__init__.py index e69de29bb2..e96d3e02e4 100644 --- a/test/e2e/tests/settings/__init__.py +++ b/test/e2e/tests/settings/__init__.py @@ -0,0 +1,3 @@ +import pytest + +marks = pytest.mark.settings_all diff --git a/test/e2e/tests/settings/settings_keycard/__init__.py b/test/e2e/tests/settings/settings_keycard/__init__.py index e69de29bb2..84f36ad71a 100644 --- a/test/e2e/tests/settings/settings_keycard/__init__.py +++ b/test/e2e/tests/settings/settings_keycard/__init__.py @@ -0,0 +1,4 @@ +import pytest +from .. import marks + +marks = [pytest.mark.settings_keycard, marks] diff --git a/test/e2e/tests/settings/settings_keycard/test_check_whats_on_keycard.py b/test/e2e/tests/settings/settings_keycard/test_check_whats_on_keycard.py index 8e69dbc85b..fe86fb410a 100644 --- a/test/e2e/tests/settings/settings_keycard/test_check_whats_on_keycard.py +++ b/test/e2e/tests/settings/settings_keycard/test_check_whats_on_keycard.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import configs import constants @@ -14,6 +15,7 @@ from constants.keycard import Keycard from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703627', 'Check whats on a Keycard') @pytest.mark.case(703627) diff --git a/test/e2e/tests/settings/settings_keycard/test_create_keycard_account_with_new_seed_phrase.py b/test/e2e/tests/settings/settings_keycard/test_create_keycard_account_with_new_seed_phrase.py index 979af17d5b..623420b5c8 100644 --- a/test/e2e/tests/settings/settings_keycard/test_create_keycard_account_with_new_seed_phrase.py +++ b/test/e2e/tests/settings/settings_keycard/test_create_keycard_account_with_new_seed_phrase.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import configs import driver @@ -12,6 +13,7 @@ from constants.keycard import Keycard from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703624', 'Create a new keycard account with a new seed phrase') diff --git a/test/e2e/tests/settings/settings_keycard/test_factory_reset_keycard.py b/test/e2e/tests/settings/settings_keycard/test_factory_reset_keycard.py index ea542dc487..b4d4bcc0f2 100644 --- a/test/e2e/tests/settings/settings_keycard/test_factory_reset_keycard.py +++ b/test/e2e/tests/settings/settings_keycard/test_factory_reset_keycard.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs import constants @@ -11,6 +12,7 @@ from constants.keycard import Keycard from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703628', 'Factory reset a Keycard') @pytest.mark.case(703628) diff --git a/test/e2e/tests/settings/settings_keycard/test_import_restore_keycard_via_seed_phrase.py b/test/e2e/tests/settings/settings_keycard/test_import_restore_keycard_via_seed_phrase.py index d1d89d2287..69061a0b70 100644 --- a/test/e2e/tests/settings/settings_keycard/test_import_restore_keycard_via_seed_phrase.py +++ b/test/e2e/tests/settings/settings_keycard/test_import_restore_keycard_via_seed_phrase.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import configs import constants @@ -13,6 +14,7 @@ from constants.keycard import Keycard from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703625', 'Import or restore a Keycard via a seed phrase') diff --git a/test/e2e/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py b/test/e2e/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py index 47e53db8d6..bfd2062154 100644 --- a/test/e2e/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py +++ b/test/e2e/tests/settings/settings_keycard/test_redirect_to_keycard_settings_from_wallet.py @@ -1,11 +1,13 @@ import allure import pytest from allure_commons._allure import step +from . import marks from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.main_window import MainWindow from gui.screens.settings_keycard import KeycardSettingsView +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703514', 'Choosing Use Keycard when adding account') diff --git a/test/e2e/tests/settings/settings_keycard/test_setup_existing_account.py b/test/e2e/tests/settings/settings_keycard/test_setup_existing_account.py index 8f7f3fcd23..ee254eb14c 100644 --- a/test/e2e/tests/settings/settings_keycard/test_setup_existing_account.py +++ b/test/e2e/tests/settings/settings_keycard/test_setup_existing_account.py @@ -4,6 +4,7 @@ from pathlib import Path import allure import pytest from allure import step +from . import marks import configs import constants @@ -16,6 +17,7 @@ from gui.components.community.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703623', 'Setup a keycard with an existing account') diff --git a/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py b/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py index c50fa9dd8c..c4574e16ed 100644 --- a/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py +++ b/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import configs import constants @@ -11,6 +12,7 @@ from constants.keycard import Keycard from gui.main_window import MainWindow from gui.mocked_keycard_controller import MockedKeycardController +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704607', 'Unlock Keycard') @pytest.mark.case(704607) diff --git a/test/e2e/tests/settings/settings_messaging/__init__.py b/test/e2e/tests/settings/settings_messaging/__init__.py index e69de29bb2..26194481b9 100644 --- a/test/e2e/tests/settings/settings_messaging/__init__.py +++ b/test/e2e/tests/settings/settings_messaging/__init__.py @@ -0,0 +1,4 @@ +import pytest +from .. import marks + +marks = [pytest.mark.settings_messaging, marks] diff --git a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py index cbc36d7a69..d770fff5d5 100644 --- a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py +++ b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_accept_request.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs.testpath import constants @@ -9,7 +10,7 @@ from constants.messaging import Messaging from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +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', [ diff --git a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py index 2c7bbc8b70..06fbe259fe 100644 --- a/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py +++ b/test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import configs.testpath import constants @@ -10,7 +11,7 @@ from constants import UserAccount from constants.messaging import Messaging from gui.main_window import MainWindow - +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', [ diff --git a/test/e2e/tests/settings/settings_profile/__init__.py b/test/e2e/tests/settings/settings_profile/__init__.py index e69de29bb2..32183b9ae8 100644 --- a/test/e2e/tests/settings/settings_profile/__init__.py +++ b/test/e2e/tests/settings/settings_profile/__init__.py @@ -0,0 +1,4 @@ +import pytest +from .. import marks + +marks = [pytest.mark.settings_profile, marks] diff --git a/test/e2e/tests/settings/settings_profile/test_settings_profile_change_password.py b/test/e2e/tests/settings/settings_profile/test_settings_profile_change_password.py index cc869d92b4..f3e980524a 100644 --- a/test/e2e/tests/settings/settings_profile/test_settings_profile_change_password.py +++ b/test/e2e/tests/settings/settings_profile/test_settings_profile_change_password.py @@ -1,11 +1,13 @@ import allure import pytest from allure_commons._allure import step +from . import marks import constants from driver.aut import AUT from gui.main_window import MainWindow +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703005', 'Change the password and login with new password') diff --git a/test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py b/test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py index 75eb28803a..d006f63703 100644 --- a/test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py +++ b/test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py @@ -1,13 +1,14 @@ import allure import pytest from allure_commons._allure import step +from . import marks import constants from driver.aut import AUT from gui.components.settings.changes_detected_popup import ChangesDetectedToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703006', 'Set display name, bio and social links') @pytest.mark.case(703006) diff --git a/test/e2e/tests/settings/settings_wallet/__init__.py b/test/e2e/tests/settings/settings_wallet/__init__.py index e69de29bb2..cd8eef26cc 100644 --- a/test/e2e/tests/settings/settings_wallet/__init__.py +++ b/test/e2e/tests/settings/settings_wallet/__init__.py @@ -0,0 +1,4 @@ +import pytest +from .. import marks + +marks = [pytest.mark.settings_wallet, marks] diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py index ea0f2cf138..84b5cea8f6 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs import driver @@ -9,7 +10,7 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow, LeftPanel from scripts.tools import image - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703415', 'Account order: account order could be changed with drag&drop') @pytest.mark.case(703415) diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py index c8c1199712..90f9b04110 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_delete_account.py @@ -4,6 +4,7 @@ import string import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -14,7 +15,7 @@ from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow from gui.screens.settings_wallet import WalletSettingsView - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704454', 'Account view interactions: Delete generated account') @pytest.mark.case(704454) diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py index b7bf1b58be..9301546709 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py @@ -4,12 +4,13 @@ import string import allure import pytest from allure_commons._allure import step +from . import marks from constants.wallet import WalletNetworkSettings, DerivationPath, WalletAccountSettings from gui.main_window import MainWindow from gui.screens.settings import SettingsScreen - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704433', 'Account view interactions: Edit Status default account') @pytest.mark.case(704433) diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py index c0c56a7f2e..0188c2ef62 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py @@ -5,6 +5,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup @@ -12,7 +13,7 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/edit/703598', 'Add new account from wallet settings screen') @pytest.mark.case(703598) diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_edit_network.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_edit_network.py index 7473288b75..85239bf05f 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_edit_network.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_edit_network.py @@ -1,6 +1,7 @@ import allure import pytest from allure_commons._allure import step +from . import marks import driver @@ -8,7 +9,7 @@ from constants.wallet import WalletNetworkNaming, WalletEditNetworkErrorMessages from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703515', 'Network: Network: Editing network -> Restore defaults') @pytest.mark.case(703515) diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py index 44fb4cd845..a430509bd9 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py @@ -1,6 +1,7 @@ import allure import pytest from allure import step +from . import marks import configs.system from constants.wallet import WalletNetworkSettings, WalletNetworkNaming @@ -8,7 +9,7 @@ from gui.components.wallet.testnet_mode_banner import TestnetModeBanner from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703505', 'Network: Testnet switching') @pytest.mark.case(703505) def test_switch_testnet_mode(main_screen: MainWindow): diff --git a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py index 65507de035..e4ad3dd061 100644 --- a/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py +++ b/test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py @@ -4,6 +4,7 @@ import string import allure import pytest from allure_commons._allure import step +from . import marks import configs import driver @@ -12,7 +13,7 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.main_window import MainWindow from gui.screens.settings_wallet import WalletSettingsView - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703508', 'Watched addresses: Excl. / Include in total balance functionality for watched address') @pytest.mark.case(703508) diff --git a/test/e2e/tests/settings/test_settings_back_up_seed.py b/test/e2e/tests/settings/test_settings_back_up_seed.py index a7c25f4864..a17eb1b098 100644 --- a/test/e2e/tests/settings/test_settings_back_up_seed.py +++ b/test/e2e/tests/settings/test_settings_back_up_seed.py @@ -1,13 +1,14 @@ import allure import pytest from allure_commons._allure import step +from . import marks import configs import driver from gui.components.back_up_your_seed_phrase_banner import BackUpSeedPhraseBanner from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703001', 'Backup seed phrase') @pytest.mark.case(703001) def test_back_up_seed_phrase(main_screen: MainWindow): diff --git a/test/e2e/tests/settings/test_settings_sign_out_and_quit.py b/test/e2e/tests/settings/test_settings_sign_out_and_quit.py index d6544774cd..5d309cec51 100644 --- a/test/e2e/tests/settings/test_settings_sign_out_and_quit.py +++ b/test/e2e/tests/settings/test_settings_sign_out_and_quit.py @@ -3,8 +3,9 @@ import pytest import psutil from allure_commons._allure import step from gui.main_window import MainWindow +from . import marks - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703010', 'Settings - Sign out & Quit') @pytest.mark.case(703010) def test_sign_out_and_quit(aut, main_screen: MainWindow): diff --git a/test/e2e/tests/wallet_main_screen/__init__.py b/test/e2e/tests/wallet_main_screen/__init__.py index e69de29bb2..89d753fcb3 100644 --- a/test/e2e/tests/wallet_main_screen/__init__.py +++ b/test/e2e/tests/wallet_main_screen/__init__.py @@ -0,0 +1,3 @@ +import pytest + +marks = pytest.mark.wallet \ No newline at end of file diff --git a/test/e2e/tests/wallet_main_screen/test_context_menu_edit_default_account.py b/test/e2e/tests/wallet_main_screen/test_context_menu_edit_default_account.py index 20b77f7499..7aa3846d5d 100644 --- a/test/e2e/tests/wallet_main_screen/test_context_menu_edit_default_account.py +++ b/test/e2e/tests/wallet_main_screen/test_context_menu_edit_default_account.py @@ -3,12 +3,13 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703022', 'Edit default wallet account') @pytest.mark.case(703022) @pytest.mark.parametrize('name, new_name, new_color, new_emoji, new_emoji_unicode', [ diff --git a/test/e2e/tests/wallet_main_screen/test_context_menu_manage_watched_address.py b/test/e2e/tests/wallet_main_screen/test_context_menu_manage_watched_address.py index 505f3e5b2f..62ba2411f5 100644 --- a/test/e2e/tests/wallet_main_screen/test_context_menu_manage_watched_address.py +++ b/test/e2e/tests/wallet_main_screen/test_context_menu_manage_watched_address.py @@ -3,13 +3,14 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703026', 'Manage a watch-only account from context menu option') @pytest.mark.case(703026) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py b/test/e2e/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py index 4cb0c75bd7..bba659c72e 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_add_account_after_restart.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import constants from driver.aut import AUT @@ -11,7 +12,7 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704459', 'User can add one more account after restarting the app') @pytest.mark.case(704459) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_add_watched_address.py b/test/e2e/tests/wallet_main_screen/test_plus_button_add_watched_address.py index af7603f698..90ba8f058b 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_add_watched_address.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_add_watched_address.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants from gui.components.signing_phrase_popup import SigningPhrasePopup @@ -10,7 +11,7 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703026', 'Manage a watch-only account') @pytest.mark.case(703026) @pytest.mark.parametrize('address, name, color, emoji, emoji_unicode', [ diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py index aded7b3d82..d740f3b847 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_added_for_imported_seed_phrase.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure import step +from . import marks import constants import driver @@ -11,7 +12,7 @@ from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703036', 'Manage an account created from the generated seed phrase') @pytest.mark.case(703036) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py index c42f82ad04..7b73378d5e 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_private_key.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -11,7 +12,7 @@ from gui.components.toast_message import ToastMessage from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703029', 'Manage a private key imported account') @pytest.mark.case(703029) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py index 88275f248d..770823be1f 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_account_from_seed_phrase.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -11,7 +12,7 @@ from gui.components.toast_message import ToastMessage from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703030', 'Manage a seed phrase imported account') @pytest.mark.case(703030) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account.py b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account.py index 5913fd3254..72bb2c485e 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -11,7 +12,7 @@ from gui.components.toast_message import ToastMessage from gui.components.wallet.authenticate_popup import AuthenticatePopup from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703033', 'Manage a generated account') @pytest.mark.case(703033) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) diff --git a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py index c7daef414b..93be40f934 100644 --- a/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py +++ b/test/e2e/tests/wallet_main_screen/test_plus_button_manage_generated_account_custom_derivation_path.py @@ -3,6 +3,7 @@ import time import allure import pytest from allure_commons._allure import step +from . import marks import constants import driver @@ -10,7 +11,7 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.components.toast_message import ToastMessage from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703028', 'Manage a custom generated account') @pytest.mark.case(703028) @pytest.mark.parametrize('user_account', [constants.user.user_account_one]) diff --git a/test/e2e/tests/wallet_main_screen/test_saved_addresses.py b/test/e2e/tests/wallet_main_screen/test_saved_addresses.py index 46b0f7eaa0..e933114ee9 100644 --- a/test/e2e/tests/wallet_main_screen/test_saved_addresses.py +++ b/test/e2e/tests/wallet_main_screen/test_saved_addresses.py @@ -1,13 +1,14 @@ import allure import pytest from allure import step +from . import marks import configs import driver from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.main_window import MainWindow - +pytestmark = marks @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703021', 'Manage a saved address') @pytest.mark.case(703021) @pytest.mark.parametrize('name, address, new_name', [