Skip to content

Commit

Permalink
use eth.staging fleet for e2e builds
Browse files Browse the repository at this point in the history
This should help us acquire more accurate statistics.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
  • Loading branch information
jakubgs committed Jun 30, 2020
1 parent d916751 commit b5fda12
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .env.e2e
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,4 +22,4 @@ BLANK_PREVIEW=0
TOOLTIP_EVENTS=1
COMMANDS_ENABLED=1
KEYCARD_TEST_MENU=1
QR_READ_TEST_MENU=1
QR_READ_TEST_MENU=1
5 changes: 4 additions & 1 deletion test/appium/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down
14 changes: 7 additions & 7 deletions test/appium/tests/atomic/account_management/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit b5fda12

Please sign in to comment.