From ceb5a14ef6d3e9603ec509ea0ed5b2387fd43c91 Mon Sep 17 00:00:00 2001 From: Churikova Tetiana Date: Tue, 26 Apr 2022 16:58:10 +0200 Subject: [PATCH] ... --- test/appium/support/testrail_report.py | 1 + test/appium/tests/conftest.py | 2 -- .../tests/critical/test_public_chat_browsing.py | 2 +- .../tests/critical/wallet_and_tx/test_wallet.py | 13 ++++++------- test/appium/tests/medium/chats/test_chats.py | 4 ++-- test/appium/tests/medium/test_browser_profile.py | 2 +- test/appium/tests/medium/test_multiple_devices.py | 1 - 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py index 5e4d983a1a..3c214f1902 100644 --- a/test/appium/support/testrail_report.py +++ b/test/appium/support/testrail_report.py @@ -114,6 +114,7 @@ class TestrailReport(BaseTestReport): test_cases['pr']['1_1_chat_commands'] = 50825 test_cases['pr']['ens'] = 50827 test_cases['pr']['sync'] = 50834 + test_cases['pr']['browser'] = 50812 ## Nightly e2e test_cases['nightly']['medium'] = 736 test_cases['nightly']['chat'] = 50811 diff --git a/test/appium/tests/conftest.py b/test/appium/tests/conftest.py index c93aefcbd5..63fb4abc44 100644 --- a/test/appium/tests/conftest.py +++ b/test/appium/tests/conftest.py @@ -293,8 +293,6 @@ def pytest_runtest_protocol(item, nextitem): reports = runtestprotocol(item, nextitem=nextitem) for report in reports: if report.failed and should_rerun_test(report.longreprtext): - # is_in_group = [i for i in item.iter_markers(name='xdist_group')] - # if report.failed and should_rerun_test(report.longreprtext): break # rerun else: return True # no need to rerun diff --git a/test/appium/tests/critical/test_public_chat_browsing.py b/test/appium/tests/critical/test_public_chat_browsing.py index 8faa2c0870..1bd79580c1 100644 --- a/test/appium/tests/critical/test_public_chat_browsing.py +++ b/test/appium/tests/critical/test_public_chat_browsing.py @@ -222,7 +222,7 @@ class TestPublicChatMultipleDeviceMerged(MultipleSharedDeviceTestCase): self.errors.verify_no_errors() -@pytest.mark.xdist_group(name="two_1") +@pytest.mark.xdist_group(name="three_1") @marks.critical class TestPublicChatBrowserOneDeviceMerged(MultipleSharedDeviceTestCase): 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..80f4675bdb 100644 --- a/test/appium/tests/critical/wallet_and_tx/test_wallet.py +++ b/test/appium/tests/critical/wallet_and_tx/test_wallet.py @@ -252,7 +252,6 @@ class TestWalletManagementDeviceMerged(MultipleSharedDeviceTestCase): self.errors.verify_no_errors() @marks.testrail_id(700762) - @marks.skip # TODO: skipped due to #13016 def test_wallet_add_account_seed_phrase_collectibles_mainnet_rinkeby(self): user = wallet_users['E'] @@ -283,12 +282,12 @@ class TestWalletManagementDeviceMerged(MultipleSharedDeviceTestCase): if not account_button.is_element_displayed(): self.wallet.accounts_status_account.swipe_left_on_element() - self.home.just_fyi('Check that collectibles are not shown on Ropsten') - account_button.click() - self.wallet.collectibles_button.click() - self.wallet.element_by_translation_id("display-collectibles").scroll_and_click() - if not self.wallet.element_by_translation_id("no-collectibles").is_element_displayed(): - self.errors.append("Collectibles are shown on Ropsten network!") + # self.home.just_fyi('Check that collectibles are not shown on Ropsten') + # account_button.click() + # self.wallet.collectibles_button.click() + # self.wallet.element_by_translation_id("display-collectibles").scroll_and_click() + # if not self.wallet.element_by_translation_id("no-collectibles").is_element_displayed(): + # self.errors.append("Collectibles are shown on Ropsten network!") self.wallet.just_fyi('Check collectibles amount in wallet') profile = self.home.profile_button.click() diff --git a/test/appium/tests/medium/chats/test_chats.py b/test/appium/tests/medium/chats/test_chats.py index 3b67b93b1b..72f39f9615 100644 --- a/test/appium/tests/medium/chats/test_chats.py +++ b/test/appium/tests/medium/chats/test_chats.py @@ -8,7 +8,7 @@ from tests.base_test_case import create_shared_drivers, MultipleSharedDeviceTest from views.sign_in_view import SignInView -@pytest.mark.xdist_group(name="public_chat_medium_2") +@pytest.mark.xdist_group(name="one_2") @marks.medium class TestPublicChatMultipleDeviceMergedMedium(MultipleSharedDeviceTestCase): @classmethod @@ -133,7 +133,7 @@ class TestPublicChatMultipleDeviceMergedMedium(MultipleSharedDeviceTestCase): self.errors.verify_no_errors() -@pytest.mark.xdist_group(name="chat_medium_2") +@pytest.mark.xdist_group(name="two_2") @marks.medium class TestChatMultipleDevice(MultipleSharedDeviceTestCase): diff --git a/test/appium/tests/medium/test_browser_profile.py b/test/appium/tests/medium/test_browser_profile.py index 69abc4ce81..3f9a7c09b9 100644 --- a/test/appium/tests/medium/test_browser_profile.py +++ b/test/appium/tests/medium/test_browser_profile.py @@ -6,7 +6,7 @@ from views.sign_in_view import SignInView from tests.users import basic_user, ens_user, ens_user_ropsten, transaction_senders, chat_users -@pytest.mark.xdist_group(name="browser_profile_medium_1") +@pytest.mark.xdist_group(name="two_1") @marks.medium class TestBrowserProfileOneDevice(MultipleSharedDeviceTestCase): diff --git a/test/appium/tests/medium/test_multiple_devices.py b/test/appium/tests/medium/test_multiple_devices.py index d1c2bd4663..1284cddea6 100644 --- a/test/appium/tests/medium/test_multiple_devices.py +++ b/test/appium/tests/medium/test_multiple_devices.py @@ -1231,7 +1231,6 @@ class TestChatManagementMultipleDevice(MultipleDeviceTestCase): self.errors.verify_no_errors() @marks.testrail_id(5432) - @marks.medium # TODO: can be united with other 2-driver profile e2e def test_profile_custom_bootnodes(self): self.create_drivers(2)