Skip to content

Commit

Permalink
adjust tests to eth.fleet
Browse files Browse the repository at this point in the history
Signed-off-by: Churikova Tetiana <churikova.tm@gmail.com>
  • Loading branch information
churik committed Nov 5, 2019
1 parent 1c63c78 commit 2e8e1a3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions test/appium/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ def debug(text: str):
"fb7cefd31c3c88d600a775f14ed5781520a88ecd25da3c6:status-offline-inbox@35.225.227.79:30504"
mailserver_central_2 = 'mail-02.gc-us-central1-a.eth.beta'
mailserver_central_3 = 'mail-03.gc-us-central1-a.eth.beta'
mailserver_staging_central_1 = 'mail-01.gc-us-central1-a.eth.staging'
mailserver_staging_ams_1 = 'mail-01.do-ams3.eth.staging'

mailserver_ams_01 = 'mail-01.do-ams3.eth.beta'
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
16 changes: 8 additions & 8 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 @@
import re

from tests import marks, bootnode_address, mailserver_address, camera_access_error_text, \
photos_access_error_text, test_dapp_url, test_dapp_name, mailserver_central_2, mailserver_central_3, \
photos_access_error_text, test_dapp_url, test_dapp_name, mailserver_staging_ams_1, mailserver_staging_central_1, \
mailserver_ams_01
from tests.base_test_case import SingleDeviceTestCase, MultipleDeviceTestCase
from tests.users import transaction_senders, basic_user, ens_user
Expand Down Expand Up @@ -373,10 +373,10 @@ def test_log_level_and_fleet(self):
# TODO: should be edited after showing some text in setting when log in disabled
if profile_view.log_level_setting.is_element_displayed():
self.errors.append('Log is not disabled')
if not profile_view.element_by_text('eth.beta').is_element_displayed():
self.errors.append('Fleet is not set to eth.beta')
if not profile_view.element_by_text('eth.staging').is_element_displayed():
self.errors.append('Fleet is not set to eth.staging')
else:
for text in 'INFO', 'eth.beta':
for text in 'INFO', 'eth.staging':
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 @@ -494,7 +494,7 @@ def test_version_format(self):
node_version = profile_view.node_version_text.text
if not re.search("\d{1}[.]\d{1,2}[.]\d{1,2}\s[(]\d*[)]", app_version):
self.errors.append("App version %s didn't match expected format" % app_version)
if not re.search("StatusIM\/android-\d{3}\/go\d{1}[.]\d{1,2}[.]\d{1,2}", node_version):
if not re.search("StatusIM\/v\d{1}[.]\d{1,2}[.]\d{1,2}-beta.\d\/android-\d{3}\/go\d{1}[.]\d{1,2}[.]\d{1,2}", node_version):
self.errors.append("Node version %s didn't match expected format" % node_version)
profile_view.app_version_text.click()
profile_view.back_button.click()
Expand All @@ -516,7 +516,7 @@ def test_use_pinned_mailserver(self):
profile_view.just_fyi('pin mailserver')
profile_view.sync_settings_button.click()
# TODO: temporary to avoid issue 9269 - should be disabled after fix
mailserver = mailserver_central_3 if profile_view.element_by_text(mailserver_central_2).is_element_present() else mailserver_central_2
mailserver = mailserver_staging_central_1 if profile_view.element_by_text(mailserver_staging_ams_1).is_element_present() else mailserver_staging_ams_1
profile_view.mail_server_button.click()
profile_view.mail_server_auto_selection_button.click()
profile_view.element_by_text(mailserver).click()
Expand Down Expand Up @@ -606,7 +606,7 @@ def test_add_and_switch_to_custom_mailserver(self):
profile_1.sync_settings_button.click()
profile_1.mail_server_button.click()
# TODO: temporary pin mailserver to avoid issue 9269 - should be disabled after fix
mailserver = mailserver_ams_01 if profile_1.element_by_text(mailserver_central_2).is_element_present() else mailserver_central_2
mailserver = mailserver_ams_01 if profile_1.element_by_text(mailserver_staging_ams_1).is_element_present() else mailserver_staging_ams_1
profile_1.mail_server_auto_selection_button.click()
profile_1.element_by_text(mailserver).click()
profile_1.confirm_button.click()
Expand Down Expand Up @@ -686,7 +686,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()
profile_1.element_by_text(mailserver_central_2).click()
profile_1.element_by_text(mailserver_staging_ams_1).click()
profile_1.confirm_button.click()
profile_1.home_button.click()
if not public_chat_1.chat_element_by_text(message).is_element_displayed(30):
Expand Down

0 comments on commit 2e8e1a3

Please sign in to comment.