From afb3b2a0f270d227d6de97096b92d54b31ccdd1d Mon Sep 17 00:00:00 2001 From: yevh-berdnyk Date: Sun, 1 May 2022 01:50:08 +0300 Subject: [PATCH] Changed tests run --- ci/tests/Jenkinsfile.e2e-prs | 2 +- test/appium/tests/critical/chats/test_1_1_public_chats.py | 4 ++++ test/appium/tests/critical/chats/test_group_chat.py | 1 + .../appium/tests/critical/onboarding/test_onboarding_flows.py | 2 ++ test/appium/tests/critical/test_pairing_devices_sync.py | 1 + test/appium/tests/critical/test_public_chat_browsing.py | 2 ++ .../tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py | 2 ++ test/appium/tests/critical/wallet_and_tx/test_wallet.py | 1 + 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 60ae2c9251..1136003028 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -97,7 +97,7 @@ pipeline { sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py' sh """ python3 -m pytest \ - --numprocesses 15 \ + --numprocesses 9 \ --rerun_count=2 \ --testrail_report=True \ -m \"${params.TEST_MARKERS}\" \ diff --git a/test/appium/tests/critical/chats/test_1_1_public_chats.py b/test/appium/tests/critical/chats/test_1_1_public_chats.py index b713286c76..89b511c24f 100644 --- a/test/appium/tests/critical/chats/test_1_1_public_chats.py +++ b/test/appium/tests/critical/chats/test_1_1_public_chats.py @@ -11,6 +11,7 @@ import pytest @pytest.mark.xdist_group(name="commands_2") @marks.critical +@pytest.mark.run1 class TestCommandsMultipleDevicesMerged(MultipleSharedDeviceTestCase): @classmethod @@ -210,6 +211,7 @@ class TestCommandsMultipleDevicesMerged(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="1_1_chat_2") @marks.critical +@pytest.mark.run1 class TestOneToOneChatMultipleSharedDevices(MultipleSharedDeviceTestCase): @classmethod @@ -601,6 +603,7 @@ class TestOneToOneChatMultipleSharedDevices(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="chats_contacts_keycard_2") @marks.critical +@pytest.mark.run1 class TestContactBlockMigrateKeycardMultipleSharedDevices(MultipleSharedDeviceTestCase): @classmethod @@ -941,6 +944,7 @@ class TestContactBlockMigrateKeycardMultipleSharedDevices(MultipleSharedDeviceTe @pytest.mark.xdist_group(name="ens_stickers_mention_2") @marks.critical +@pytest.mark.run1 class TestEnsStickersMultipleDevicesMerged(MultipleSharedDeviceTestCase): @classmethod diff --git a/test/appium/tests/critical/chats/test_group_chat.py b/test/appium/tests/critical/chats/test_group_chat.py index 0d6b74d35d..088fe2a82e 100644 --- a/test/appium/tests/critical/chats/test_group_chat.py +++ b/test/appium/tests/critical/chats/test_group_chat.py @@ -7,6 +7,7 @@ from views.chat_view import ChatView @pytest.mark.xdist_group(name="group_chat_3") @marks.critical +@pytest.mark.run1 class TestGroupChatMultipleDeviceMerged(MultipleSharedDeviceTestCase): @classmethod diff --git a/test/appium/tests/critical/onboarding/test_onboarding_flows.py b/test/appium/tests/critical/onboarding/test_onboarding_flows.py index 7b10adac28..1ad900e901 100644 --- a/test/appium/tests/critical/onboarding/test_onboarding_flows.py +++ b/test/appium/tests/critical/onboarding/test_onboarding_flows.py @@ -10,6 +10,7 @@ from tests.users import basic_user, transaction_senders @pytest.mark.xdist_group(name="onboarding_1") @marks.critical +@pytest.mark.run2 class TestOnboardingOneDeviceMerged(MultipleSharedDeviceTestCase): @classmethod @@ -224,6 +225,7 @@ class TestOnboardingOneDeviceMerged(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="restore_1") @marks.critical +@pytest.mark.run2 class TestRestoreOneDeviceMerged(MultipleSharedDeviceTestCase): @classmethod def setup_class(cls): diff --git a/test/appium/tests/critical/test_pairing_devices_sync.py b/test/appium/tests/critical/test_pairing_devices_sync.py index 5c4829e8df..8385e8e9f6 100644 --- a/test/appium/tests/critical/test_pairing_devices_sync.py +++ b/test/appium/tests/critical/test_pairing_devices_sync.py @@ -90,6 +90,7 @@ class TestPairingMultipleDevicesMerged(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="sync_2") @marks.critical +@pytest.mark.run1 class TestPairingSyncMultipleDevicesMerged(MultipleSharedDeviceTestCase): @classmethod diff --git a/test/appium/tests/critical/test_public_chat_browsing.py b/test/appium/tests/critical/test_public_chat_browsing.py index e60b3d39a6..9c774f46d8 100644 --- a/test/appium/tests/critical/test_public_chat_browsing.py +++ b/test/appium/tests/critical/test_public_chat_browsing.py @@ -13,6 +13,7 @@ from selenium.common.exceptions import NoSuchElementException @pytest.mark.xdist_group(name="public_chat_2") @marks.critical +@pytest.mark.run2 class TestPublicChatMultipleDeviceMerged(MultipleSharedDeviceTestCase): @classmethod @@ -224,6 +225,7 @@ class TestPublicChatMultipleDeviceMerged(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="public_chat_browser_1") @marks.critical +@pytest.mark.run2 class TestPublicChatBrowserOneDeviceMerged(MultipleSharedDeviceTestCase): @classmethod diff --git a/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py b/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py index 94f6a61acf..9b32568495 100644 --- a/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py +++ b/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py @@ -11,6 +11,7 @@ from views.sign_in_view import SignInView @pytest.mark.xdist_group(name="send_tx_1") @marks.critical +@pytest.mark.run1 class TestSendTxDeviceMerged(MultipleSharedDeviceTestCase): @classmethod def setup_class(cls): @@ -266,6 +267,7 @@ class TestSendTxDeviceMerged(MultipleSharedDeviceTestCase): @pytest.mark.xdist_group(name="keycard_tx_1") @marks.critical +@pytest.mark.run1 class TestKeycardTxOneDeviceMerged(MultipleSharedDeviceTestCase): @classmethod def setup_class(cls): diff --git a/test/appium/tests/critical/wallet_and_tx/test_wallet.py b/test/appium/tests/critical/wallet_and_tx/test_wallet.py index e1792879c2..ccaec03ce0 100644 --- a/test/appium/tests/critical/wallet_and_tx/test_wallet.py +++ b/test/appium/tests/critical/wallet_and_tx/test_wallet.py @@ -11,6 +11,7 @@ from support.utilities import get_merged_txs_list @pytest.mark.xdist_group(name="wallet_management_1") @marks.critical +@pytest.mark.run1 class TestWalletManagementDeviceMerged(MultipleSharedDeviceTestCase): @classmethod