From 905a5d21b4fbbc236c7d47227973d21198fbe445 Mon Sep 17 00:00:00 2001 From: Valentina Novgorodtceva Date: Wed, 31 Jul 2024 12:18:37 +0700 Subject: [PATCH] chore: introduced local run mark and added skipif mark to skip them on ci --- test/e2e/gui/screens/settings.py | 2 +- test/e2e/pytest.ini | 1 + ...allet_settings_watched_addr_include_in_total_balance.py | 7 +++++-- .../test_footer_actions_default_account_values.py | 6 ++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/e2e/gui/screens/settings.py b/test/e2e/gui/screens/settings.py index 49a55a2c45..e90dee3b0c 100644 --- a/test/e2e/gui/screens/settings.py +++ b/test/e2e/gui/screens/settings.py @@ -96,7 +96,7 @@ class LeftPanel(QObject): @allure.step('Open ENS usernames settings') @handle_settings_opening(ENSSettingsView, '3-MainMenuItem') def open_ens_usernames_settings(self, click_attempts: int = 2) -> 'ENSSettingsView': - assert ENSSettingsView().exists, 'ENS settings view was not opened' + assert ENSSettingsView().wait_until_appears(), 'ENS settings view was not opened' return ENSSettingsView() @allure.step('Open advanced settings') diff --git a/test/e2e/pytest.ini b/test/e2e/pytest.ini index 3b851d0b5c..1cc01d24ff 100644 --- a/test/e2e/pytest.ini +++ b/test/e2e/pytest.ini @@ -23,4 +23,5 @@ markers = transaction: All tests which are doing transactions online_identifier: All tests related to online_identifier functionality timeout: Apply timeout when test is running longer than expected + local_run: All tests which fail on ci but pass locally 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 b13b673c4e..5f87bdb36d 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,8 @@ import string import allure import pytest from allure_commons._allure import step + +from configs import testpath from . import marks import configs @@ -23,8 +25,9 @@ pytestmark = marks pytest.param('0x7f1502605A2f2Cc01f9f4E7dd55e549954A8cD0C', ''.join(random.choices(string.ascii_letters + string.digits, k=20))) ]) -@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14862") -@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14509") +@pytest.mark.local_run +@pytest.mark.skipif('jenkins' in str(testpath.ROOT), + reason="https://github.com/status-im/status-desktop/issues/14862, https://github.com/status-im/status-desktop/issues/14509") def test_settings_include_in_total_balance(main_screen: MainWindow, name, watched_address): with (step('Open wallet on main screen and check the total balance for new account is 0')): wallet_main_screen = main_screen.left_panel.open_wallet() diff --git a/test/e2e/tests/wallet_main_screen/wallet - footer actions/test_footer_actions_default_account_values.py b/test/e2e/tests/wallet_main_screen/wallet - footer actions/test_footer_actions_default_account_values.py index 058c730aef..02eaa5eefc 100644 --- a/test/e2e/tests/wallet_main_screen/wallet - footer actions/test_footer_actions_default_account_values.py +++ b/test/e2e/tests/wallet_main_screen/wallet - footer actions/test_footer_actions_default_account_values.py @@ -2,6 +2,7 @@ import allure import pytest from allure_commons._allure import step +from configs import testpath from gui.components.signing_phrase_popup import SigningPhrasePopup @@ -11,8 +12,9 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup @pytest.mark.parametrize('default_name, address, name, color, emoji', [ pytest.param('Account 1', '0xea123F7beFF45E3C9fdF54B324c29DBdA14a639A', 'AccWatch1', '#2a4af5', 'sunglasses') ]) -@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14862") -@pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14509") +@pytest.mark.local_run +@pytest.mark.skipif('jenkins' in str(testpath.ROOT), + reason="https://github.com/status-im/status-desktop/issues/14862, https://github.com/status-im/status-desktop/issues/14509") def test_wallet_modals_default_account_values(main_screen, default_name, address, name, color, emoji): with step('Add watched address with plus action button'): wallet = main_screen.left_panel.open_wallet()