From 72069b066b7635e9d94067bf8317e872a640939b Mon Sep 17 00:00:00 2001 From: Anastasiya Semiankevich Date: Wed, 25 Dec 2024 09:41:40 +0300 Subject: [PATCH] chore(@ci): exclude keycard tests from nightly run instead of skipping them --- ci/Jenkinsfile.tests-e2e | 2 +- .../settings/settings_keycard/test_check_whats_on_keycard.py | 1 - .../test_create_keycard_account_with_new_seed_phrase.py | 1 - .../settings/settings_keycard/test_factory_reset_keycard.py | 2 -- .../test_import_restore_keycard_via_seed_phrase.py | 3 +-- .../settings/settings_keycard/test_setup_existing_account.py | 1 - .../e2e/tests/settings/settings_keycard/test_unlock_keycard.py | 2 -- 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ci/Jenkinsfile.tests-e2e b/ci/Jenkinsfile.tests-e2e index f267ab7005..fdbcd77be3 100644 --- a/ci/Jenkinsfile.tests-e2e +++ b/ci/Jenkinsfile.tests-e2e @@ -172,7 +172,7 @@ pipeline { ]) { /* Keep the --reruns flag first, or it won't work */ sh """ - python3 -m pytest -v --reruns=1 --timeout=240 ${flags.join(" ")} \ + python3 -m pytest -m "not keycard" -v --reruns=1 --timeout=240 ${flags.join(" ")} \ --disable-warnings \ --alluredir=./allure-results \ -o timeout_func_only=true 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 4f6470ca60..a482a6eb96 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 @@ -16,7 +16,6 @@ from gui.mocked_keycard_controller import MockedKeycardController @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703627', 'Check whats on a Keycard') @pytest.mark.case(703627) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_check_whats_on_keycard(main_screen: MainWindow, user_account): main_screen.prepare() timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC 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 b8feb522d9..8927d2cbe7 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 @@ -21,7 +21,6 @@ from gui.mocked_keycard_controller import MockedKeycardController [pytest.param('Test Account', '#216266', 'sunglasses', '😎 ', 'Test Account2', '#2a4af5', 'thumbsup', '👍 ', 'Test Account3', '#ff7d46', 'cool', '🆒 ') ]) -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_create_keycard_account_with_new_seed_phrase(main_screen: MainWindow, name, color, emoji_name, emoji, name1, color1, emoji1_name, emoji1, name2, color2, emoji2_name, emoji2): timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC 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 9668a04d5c..8b56d270e7 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 @@ -14,7 +14,6 @@ from gui.mocked_keycard_controller import MockedKeycardController @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703628', 'Factory reset a Keycard') @pytest.mark.case(703628) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_factory_reset_keycard(main_screen: MainWindow, user_account): main_screen.prepare() timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC @@ -68,7 +67,6 @@ def test_factory_reset_keycard(main_screen: MainWindow, user_account): 'Factory reset a Keycard: incorrect PIN') @pytest.mark.case(704606) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_factory_reset_keycard_incorrect_pin(main_screen: MainWindow, user_account): main_screen.prepare() incorrect_pin = Keycard.KEYCARD_INCORRECT_PIN.value 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 2042871aaa..f632f696fb 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 @@ -18,8 +18,7 @@ from scripts.utils.generators import random_mnemonic 'Import or restore a Keycard via a seed phrase') @pytest.mark.case(703625) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/17012') +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/17012') def test_import_restore_keycard_via_seed_phrase(main_screen: MainWindow): timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC pin = Keycard.KEYCARD_PIN.value 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 a8329972be..ccdf9d0140 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 @@ -22,7 +22,6 @@ from gui.mocked_keycard_controller import MockedKeycardController @pytest.mark.parametrize('account_name', [pytest.param('Account 1')]) @pytest.mark.timeout(timeout=210) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_setup_keycard_with_existing_account(main_screen: MainWindow, user_account, account_name): timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC first_details = '{}' 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 c515ad591e..d577567373 100644 --- a/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py +++ b/test/e2e/tests/settings/settings_keycard/test_unlock_keycard.py @@ -14,7 +14,6 @@ from gui.mocked_keycard_controller import MockedKeycardController @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704607', 'Unlock Keycard') @pytest.mark.case(704607) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_unlock_keycard_using_correct_puk(main_screen: MainWindow, user_account): timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC pin = Keycard.KEYCARD_PIN.value @@ -79,7 +78,6 @@ def test_unlock_keycard_using_correct_puk(main_screen: MainWindow, user_account) @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704608', 'Unlock Keycard: incorrect PUK') @pytest.mark.case(704608) @pytest.mark.keycard -@pytest.mark.skip(reason='https://github.com/status-im/status-desktop/issues/15741') def test_unlock_keycard_using_incorrect_puk(main_screen: MainWindow, user_account): timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC pin = Keycard.KEYCARD_PIN.value