From 900949afede285881ed9b105772c95ea3131f02f Mon Sep 17 00:00:00 2001 From: Anton Danchenko Date: Thu, 23 Aug 2018 16:50:19 +0300 Subject: [PATCH] logcat tests will run against each PR Signed-off-by: Anton Danchenko --- test/appium/support/testrail_report.py | 3 ++- test/appium/tests/__init__.py | 1 + .../account_management/test_create_account.py | 10 ++++------ .../atomic/account_management/test_profile.py | 1 - .../atomic/account_management/test_sign_in.py | 8 +++----- test/appium/tests/atomic/chats/test_commands.py | 10 ++++------ .../transactions/test_daaps_transactions.py | 16 +++++++--------- .../tests/atomic/transactions/test_wallet.py | 9 ++++----- 8 files changed, 25 insertions(+), 33 deletions(-) diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py index 11c98b585b..4c45bc9d02 100644 --- a/test/appium/support/testrail_report.py +++ b/test/appium/support/testrail_report.py @@ -82,7 +82,8 @@ class TestrailReport(BaseTestReport): test_cases['logcat_verifications'] = 718 case_ids = list() if is_pr: - case_ids = [case['id'] for case in self.get_cases(test_cases['smoke_phase_1'])] + case_ids = [case['id'] for case in self.get_cases(test_cases['smoke_phase_1']) + + self.get_cases(test_cases['logcat_verifications'])] else: for phase in test_cases: for case in self.get_cases(test_cases[phase]): diff --git a/test/appium/tests/__init__.py b/test/appium/tests/__init__.py index 8d86ad622e..62714ded43 100644 --- a/test/appium/tests/__init__.py +++ b/test/appium/tests/__init__.py @@ -161,6 +161,7 @@ group_chat_users['C_USER']['public_key'] = "0x04dcdb5cac266328c41bdb0e33a266544a "3dba7e295445505ee55ea03ee99cb7d26bee05e6b486a9bdaaf6be73a0b" common_password = 'qwerty' +unique_password = 'unique' + get_current_time() bootnode_address = "enode://a8a97f126f5e3a340cb4db28a1187c325290ec08b2c9a6b1f19845ac86c46f9fac2ba13328822590" \ "fd3de3acb09cc38b5a05272e583a2365ad1fa67f66c55b34@167.99.210.203:30404" diff --git a/test/appium/tests/atomic/account_management/test_create_account.py b/test/appium/tests/atomic/account_management/test_create_account.py index 6a1f029a0d..d467591e90 100644 --- a/test/appium/tests/atomic/account_management/test_create_account.py +++ b/test/appium/tests/atomic/account_management/test_create_account.py @@ -1,7 +1,5 @@ import pytest -import random - -from tests import marks, common_password, get_current_time, test_fairy_warning_text +from tests import marks, common_password, get_current_time, test_fairy_warning_text, unique_password from tests.base_test_case import SingleDeviceTestCase from views.sign_in_view import SignInView @@ -86,8 +84,8 @@ class TestCreateAccount(SingleDeviceTestCase): self.verify_no_errors() @marks.testrail_id(3767) + @marks.logcat def test_password_in_logcat_creating_account(self): sign_in = SignInView(self.driver) - password = random.randint(100000, 1000000) - sign_in.create_user(password=password) - sign_in.check_no_values_in_logcat(password=password) + sign_in.create_user(password=unique_password) + sign_in.check_no_values_in_logcat(password=unique_password) diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py index 87d72808f5..f08cc8eb85 100644 --- a/test/appium/tests/atomic/account_management/test_profile.py +++ b/test/appium/tests/atomic/account_management/test_profile.py @@ -143,7 +143,6 @@ class TestProfileSingleDevice(SingleDeviceTestCase): profile_view.advanced_button.click() profile_view.find_text_part('CUSTOM_ROPSTEN') - @marks.logcat @marks.testrail_id(3774) def test_logcat_backup_recovery_phrase(self): sign_in_view = SignInView(self.driver) diff --git a/test/appium/tests/atomic/account_management/test_sign_in.py b/test/appium/tests/atomic/account_management/test_sign_in.py index 04a51f04a7..1debfe61c4 100644 --- a/test/appium/tests/atomic/account_management/test_sign_in.py +++ b/test/appium/tests/atomic/account_management/test_sign_in.py @@ -1,7 +1,6 @@ import pytest -import random -from tests import marks, common_password +from tests import marks, common_password, unique_password from tests.base_test_case import MultipleDeviceTestCase, SingleDeviceTestCase from views.sign_in_view import SignInView @@ -42,12 +41,11 @@ class TestSignIn(SingleDeviceTestCase): @marks.testrail_id(3768) def test_password_in_logcat_sign_in(self): sign_in = SignInView(self.driver) - password = random.randint(100000, 1000000) - sign_in.create_user(password=password) + sign_in.create_user(password=unique_password) profile = sign_in.profile_button.click() profile.logout() sign_in.sign_in() - sign_in.check_no_values_in_logcat(password=password) + sign_in.check_no_values_in_logcat(password=unique_password) @marks.all diff --git a/test/appium/tests/atomic/chats/test_commands.py b/test/appium/tests/atomic/chats/test_commands.py index c46510f466..85bb0ef8df 100644 --- a/test/appium/tests/atomic/chats/test_commands.py +++ b/test/appium/tests/atomic/chats/test_commands.py @@ -1,10 +1,9 @@ import pytest -import random from _pytest.outcomes import Failed from decimal import Decimal as d from selenium.common.exceptions import TimeoutException -from tests import marks, transaction_users, common_password, group_chat_users, transaction_users_wallet +from tests import marks, transaction_users, common_password, group_chat_users, transaction_users_wallet, unique_password from tests.base_test_case import MultipleDeviceTestCase, SingleDeviceTestCase from views.sign_in_view import SignInView @@ -358,15 +357,14 @@ class TestCommandsSingleDevices(SingleDeviceTestCase): def test_logcat_send_transaction_in_1_1_chat(self): sender = transaction_users['C_USER'] sign_in = SignInView(self.driver) - password = random.randint(100000, 1000000) - home = sign_in.recover_access(passphrase=sender['passphrase'], password=password) + home = sign_in.recover_access(passphrase=sender['passphrase'], password=unique_password) wallet = home.wallet_button.click() wallet.set_up_wallet() wallet.home_button.click() chat = home.add_contact(transaction_users['D_USER']['public_key']) amount = chat.get_unique_amount() - chat.send_transaction_in_1_1_chat('ETH', amount, password) - chat.check_no_values_in_logcat(password=password) + chat.send_transaction_in_1_1_chat('ETH', amount, unique_password) + chat.check_no_values_in_logcat(password=unique_password) @marks.testrail_id(3736) @marks.smoke_1 diff --git a/test/appium/tests/atomic/transactions/test_daaps_transactions.py b/test/appium/tests/atomic/transactions/test_daaps_transactions.py index 0b02450df4..aae4c8f577 100644 --- a/test/appium/tests/atomic/transactions/test_daaps_transactions.py +++ b/test/appium/tests/atomic/transactions/test_daaps_transactions.py @@ -1,7 +1,7 @@ import pytest import random -from tests import transaction_users, marks +from tests import transaction_users, marks, unique_password from tests.base_test_case import SingleDeviceTestCase from views.sign_in_view import SignInView @@ -65,32 +65,30 @@ class TestTransactionDApp(SingleDeviceTestCase): def test_logcat_send_transaction_from_daap(self): sender = transaction_users['B_USER'] sign_in_view = SignInView(self.driver) - password = random.randint(100000, 1000000) - sign_in_view.recover_access(sender['passphrase'], password) + sign_in_view.recover_access(sender['passphrase'], unique_password) wallet_view = sign_in_view.wallet_button.click() wallet_view.set_up_wallet() status_test_dapp = sign_in_view.open_status_test_dapp() status_test_dapp.wait_for_d_aap_to_load() status_test_dapp.assets_button.click() send_transaction_view = status_test_dapp.request_stt_button.click() - send_transaction_view.sign_transaction(password) - send_transaction_view.check_no_values_in_logcat(password=password) + send_transaction_view.sign_transaction(unique_password) + send_transaction_view.check_no_values_in_logcat(password=unique_password) @marks.logcat @marks.testrail_id(3775) def test_logcat_sign_message_from_daap(self): sign_in_view = SignInView(self.driver) - password = random.randint(100000, 1000000) - sign_in_view.create_user(password=password) + sign_in_view.create_user(password=unique_password) status_test_dapp = sign_in_view.open_status_test_dapp() status_test_dapp.wait_for_d_aap_to_load() status_test_dapp.transactions_button.click() send_transaction_view = status_test_dapp.sign_message_button.click() send_transaction_view.sign_transaction_button.click_until_presence_of_element( send_transaction_view.enter_password_input) - send_transaction_view.enter_password_input.send_keys(password) + send_transaction_view.enter_password_input.send_keys(unique_password) send_transaction_view.sign_transaction_button.click() - send_transaction_view.check_no_values_in_logcat(password=password) + send_transaction_view.check_no_values_in_logcat(password=unique_password) @marks.testrail_id(1380) @marks.smoke_1 diff --git a/test/appium/tests/atomic/transactions/test_wallet.py b/test/appium/tests/atomic/transactions/test_wallet.py index 024c621e96..912fa80e12 100644 --- a/test/appium/tests/atomic/transactions/test_wallet.py +++ b/test/appium/tests/atomic/transactions/test_wallet.py @@ -2,7 +2,7 @@ import random import pytest -from tests import transaction_users, transaction_users_wallet, marks, common_password +from tests import transaction_users, transaction_users_wallet, marks, common_password, unique_password from tests.base_test_case import SingleDeviceTestCase, MultipleDeviceTestCase from views.sign_in_view import SignInView @@ -160,8 +160,7 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase): sender = transaction_users['E_USER'] recipient = transaction_users['F_USER'] sign_in_view = SignInView(self.driver) - password = random.randint(100000, 1000000) - sign_in_view.recover_access(sender['passphrase'], password) + sign_in_view.recover_access(sender['passphrase'], unique_password) home_view = sign_in_view.get_home_view() wallet_view = home_view.wallet_button.click() wallet_view.set_up_wallet() @@ -174,8 +173,8 @@ class TestTransactionWalletSingleDevice(SingleDeviceTestCase): send_transaction.enter_recipient_address_button.click() send_transaction.enter_recipient_address_input.set_value(recipient['address']) send_transaction.done_button.click() - send_transaction.sign_transaction(password) - send_transaction.check_no_values_in_logcat(password=password) + send_transaction.sign_transaction(unique_password) + send_transaction.check_no_values_in_logcat(password=unique_password) @marks.testrail_id(3746) @marks.smoke_1