From b5fda1234e5447cbc626059dfc78fcfbabc9e926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 29 Jun 2020 12:42:14 +0200 Subject: [PATCH] use eth.staging fleet for e2e builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should help us acquire more accurate statistics. Signed-off-by: Jakub SokoĊ‚owski --- .env.e2e | 4 ++-- test/appium/tests/__init__.py | 5 ++++- .../atomic/account_management/test_profile.py | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.env.e2e b/.env.e2e index 5f7874e0eab..d61e57e9553 100644 --- a/.env.e2e +++ b/.env.e2e @@ -3,7 +3,7 @@ DEFAULT_NETWORK=testnet_rpc ERC20_CONTRACT_WARNINGS=1 ETHEREUM_DEV_CLUSTER=1 EXTENSIONS=0 -FLEET=eth.prod +FLEET=eth.staging GROUP_CHATS_ENABLED=1 HARDWALLET_ENABLED=1 LOG_LEVEL=info @@ -22,4 +22,4 @@ BLANK_PREVIEW=0 TOOLTIP_EVENTS=1 COMMANDS_ENABLED=1 KEYCARD_TEST_MENU=1 -QR_READ_TEST_MENU=1 \ No newline at end of file +QR_READ_TEST_MENU=1 diff --git a/test/appium/tests/__init__.py b/test/appium/tests/__init__.py index c0559f8e2d1..bd3cfcaaeb4 100644 --- a/test/appium/tests/__init__.py +++ b/test/appium/tests/__init__.py @@ -40,10 +40,13 @@ def debug(text: str): "1106c465b8e2b6c4f0d93b8749d1578bfcaf03e:status-offline-inbox@104.197.238.144:443" staging_fleet = 'eth.staging' prod_fleet = 'eth.prod' +# This fleet is used in the tests +used_fleet = staging_fleet + mailserver_ams = 'mail-01.do-ams3' mailserver_hk = 'mail-02.ac-cn-hongkong-c' mailserver_gc = 'mail-01.gc-us-central1-a' -mailserver_ams_01 = 'mail-01.do-ams3.eth.prod' +mailserver_ams_01 = 'mail-01.do-ams3.{}'.format(used_fleet) camera_access_error_text = "To grant the required camera permission, please go to your system settings " \ "and make sure that Status > Camera is selected." diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py index 6ab959a73d2..25ebec4f901 100644 --- a/test/appium/tests/atomic/account_management/test_profile.py +++ b/test/appium/tests/atomic/account_management/test_profile.py @@ -2,7 +2,7 @@ from tests import marks, bootnode_address, mailserver_address, camera_access_error_text, \ photos_access_error_text, test_dapp_url, test_dapp_name, mailserver_ams, mailserver_gc, \ - mailserver_hk, prod_fleet, common_password + mailserver_hk, used_fleet, common_password from tests.base_test_case import SingleDeviceTestCase, MultipleDeviceTestCase from tests.users import transaction_senders, basic_user, ens_user from views.sign_in_view import SignInView @@ -401,7 +401,7 @@ def test_log_level_and_fleet(self): sign_in_view.create_user() profile_view = sign_in_view.profile_button.click() profile_view.advanced_button.click() - for text in 'INFO', 'eth.prod': + for text in 'INFO', used_fleet: if not profile_view.element_by_text(text).is_element_displayed(): self.errors.append('%s is not selected by default' % text) self.errors.verify_no_errors() @@ -545,8 +545,8 @@ def test_use_pinned_mailserver(self): profile_view.just_fyi('pin mailserver') profile_view.sync_settings_button.click() - mailserver_1 = profile_view.return_mailserver_name(mailserver_gc, prod_fleet) - mailserver_2 = profile_view.return_mailserver_name(mailserver_ams, prod_fleet) + mailserver_1 = profile_view.return_mailserver_name(mailserver_gc, used_fleet) + mailserver_2 = profile_view.return_mailserver_name(mailserver_ams, used_fleet) # TODO: temporary to avoid issue 9269 - should be disabled after fix mailserver = mailserver_1 if profile_view.element_by_text(mailserver_2).is_element_present() else mailserver_2 profile_view.mail_server_button.click() @@ -678,8 +678,8 @@ def test_add_switch_delete_custom_mailserver(self): profile_1.just_fyi('disable autoselection') profile_1.sync_settings_button.click() profile_1.mail_server_button.click() - mailserver_1 = profile_1.return_mailserver_name(mailserver_hk, prod_fleet) - mailserver_2 = profile_1.return_mailserver_name(mailserver_ams, prod_fleet) + mailserver_1 = profile_1.return_mailserver_name(mailserver_hk, used_fleet) + mailserver_2 = profile_1.return_mailserver_name(mailserver_ams, used_fleet) # TODO: temporary pin mailserver to avoid issue 9269 - should be disabled after fix mailserver = mailserver_1 if profile_1.element_by_text(mailserver_2).is_element_present() else mailserver_2 profile_1.mail_server_auto_selection_button.click() @@ -794,7 +794,7 @@ def test_can_not_connect_to_mailserver(self): # profile_1.just_fyi('check that can pick another mailserver and receive messages') # public_chat_1.element_by_text('PICK ANOTHER').is_element_displayed(30) # public_chat_1.element_by_text_part('PICK ANOTHER').click() - # mailserver = profile_1.return_mailserver_name(mailserver_ams, prod_fleet) + # mailserver = profile_1.return_mailserver_name(mailserver_ams, used_fleet) # profile_1.element_by_text(mailserver).click() # profile_1.confirm_button.click() # profile_1.home_button.click()