e2e: more fixes
This commit is contained in:
parent
d2e35fe928
commit
4c33b43713
|
@ -58,7 +58,7 @@ pipeline {
|
|||
sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
|
||||
sh """
|
||||
python3 -m pytest \
|
||||
--numprocesses 9 \
|
||||
--numprocesses 4 \
|
||||
--rerun_count=2 \
|
||||
--testrail_report=True \
|
||||
-m testrail_id \
|
||||
|
|
|
@ -99,7 +99,7 @@ pipeline {
|
|||
sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
|
||||
sh """
|
||||
python3 -m pytest \
|
||||
--numprocesses 9 \
|
||||
--numprocesses 4 \
|
||||
--rerun_count=2 \
|
||||
--testrail_report=True \
|
||||
-k \"${params.KEYWORD_EXPRESSION}\" \
|
||||
|
|
|
@ -74,7 +74,7 @@ pipeline {
|
|||
python3 -m pytest \
|
||||
-m "upgrade" \
|
||||
-k \"${params.KEYWORD_EXPRESSION}\" \
|
||||
--numprocesses 15 \
|
||||
--numprocesses 4 \
|
||||
--rerun_count=2 \
|
||||
--testrail_report=True \
|
||||
--apk=${params.APK_NAME} \
|
||||
|
|
|
@ -233,7 +233,7 @@ class TestrailReport(BaseTestReport):
|
|||
for geth in test.geth_paths.keys():
|
||||
self.add_attachment(method='add_attachment_to_result/%s' % str(res_id),
|
||||
path=test.geth_paths[geth])
|
||||
except AttributeError:
|
||||
except (AttributeError, FileNotFoundError):
|
||||
pass
|
||||
break
|
||||
|
||||
|
|
|
@ -153,10 +153,10 @@ class AbstractTestCase:
|
|||
|
||||
def pull_geth(self, driver):
|
||||
result = ""
|
||||
try:
|
||||
# try:
|
||||
result = driver.pull_file(self.geth_path)
|
||||
except WebDriverException:
|
||||
pass
|
||||
# except WebDriverException:
|
||||
# pass
|
||||
return base64.b64decode(result)
|
||||
|
||||
|
||||
|
|
|
@ -1495,7 +1495,7 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
|
|||
|
||||
self.device_1.just_fyi("Device 1 checks PN with emoji")
|
||||
self.device_1.open_notification_bar()
|
||||
if not self.device_1.element_by_text_part(emoji_unicode).is_element_displayed(10):
|
||||
if not self.device_1.element_by_text_part(emoji_unicode).is_element_displayed(60):
|
||||
self.device_1.driver.fail("Push notification with emoji was not received")
|
||||
chat_1 = self.device_1.click_upon_push_notification_by_text(emoji_unicode)
|
||||
|
||||
|
@ -1509,11 +1509,12 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
|
|||
if (self.device_2.element_by_text_part(message).is_element_displayed()
|
||||
or self.device_1.element_by_text_part(emoji_unicode).is_element_displayed()):
|
||||
self.errors.append("PN are keep staying after message was seen by user")
|
||||
[device.click_system_back_button_until_element_is_shown(element='chat') for device in (self.device_1, self.device_2)]
|
||||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702733)
|
||||
def test_1_1_chat_text_message_edit_delete_push_disappear(self):
|
||||
[device.click_system_back_button_until_element_is_shown() for device in
|
||||
(self.device_1, self.device_2)]
|
||||
if not self.chat_1.chat_message_input.is_element_displayed():
|
||||
self.home_1.get_chat(self.default_username_2).click()
|
||||
if not self.chat_2.chat_message_input.is_element_displayed():
|
||||
|
|
|
@ -241,10 +241,11 @@ class TestGroupChatMultipleDeviceMergedNewUI(MultipleSharedDeviceTestCase):
|
|||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702808)
|
||||
@marks.xfail(reason="mysterious issue when PNs are not fetched from offline,can not reproduce on real devices; needs investigation")
|
||||
def test_group_chat_offline_pn(self):
|
||||
[self.homes[i].click_system_back_button_until_element_is_shown() for i in range(3)]
|
||||
chat_name = 'for_offline_pn'
|
||||
#TODO: workaround for bottom sheet issues
|
||||
self.homes[0].communities_tab.click()
|
||||
self.homes[0].create_group_chat(user_names_to_add=[self.usernames[1], self.usernames[2]],
|
||||
group_chat_name=chat_name,
|
||||
new_ui=True)
|
||||
|
|
|
@ -615,6 +615,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
self.channel_2 = self.community_2.get_chat(self.channel_name).click()
|
||||
|
||||
@marks.testrail_id(702838)
|
||||
@marks.xfail(reason="blocked by #14797")
|
||||
def test_community_message_send_check_timestamps_sender_username(self):
|
||||
message = self.text_message
|
||||
sent_time_variants = self.channel_1.convert_device_time_to_chat_timestamp()
|
||||
|
@ -622,7 +623,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
if sent_time_variants and timestamp:
|
||||
if timestamp not in sent_time_variants:
|
||||
self.errors.append("Timestamp is not shown, expected: '%s', in fact: '%s'" %
|
||||
(sent_time_variants.join(','), timestamp))
|
||||
(", ".join(sent_time_variants), timestamp))
|
||||
for channel in self.channel_1, self.channel_2:
|
||||
channel.verify_message_is_under_today_text(message, self.errors)
|
||||
if self.channel_2.chat_element_by_text(message).username.text != self.default_username_1:
|
||||
|
@ -630,11 +631,13 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702843)
|
||||
@marks.xfail(reason="blocked by #14797")
|
||||
def test_community_message_edit(self):
|
||||
message_before_edit, message_after_edit = 'Message BEFORE edit', "Message AFTER edit 2"
|
||||
if not self.channel_2.chat_message_input.is_element_displayed():
|
||||
self.home_2.communities_tab.click()
|
||||
self.community_2.get_chat(self.channel_name).click()
|
||||
message_before_edit, message_after_edit = self.text_message, "Message AFTER edit 2"
|
||||
self.channel_1.send_message(message_before_edit)
|
||||
self.channel_1.edit_message_in_chat(message_before_edit, message_after_edit)
|
||||
for channel in (self.channel_1, self.channel_2):
|
||||
if not channel.element_by_text_part(message_after_edit).is_element_displayed(60):
|
||||
|
@ -663,7 +666,6 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
self.errors.append("System message about deletion for you is not displayed")
|
||||
if not self.channel_1.chat_element_by_text(message_to_delete_for_me).is_element_displayed(30):
|
||||
self.errors.append("Deleted for me message is deleted all channel members")
|
||||
|
||||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702840)
|
||||
|
@ -777,7 +779,6 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
community_1_element = self.home_1.get_chat(self.community_name, community=True)
|
||||
if community_1_element.new_messages_community.is_element_displayed():
|
||||
self.errors.append('New messages community badge is shown on community after marking messages as read')
|
||||
|
||||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702845)
|
||||
|
@ -793,6 +794,5 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
|
|||
community_to_leave.click_system_back_button_until_element_is_shown()
|
||||
if comm_to_leave_element.is_element_displayed():
|
||||
self.errors.append('Community is still shown in the list after leave')
|
||||
|
||||
self.errors.verify_no_errors()
|
||||
|
||||
|
|
|
@ -235,6 +235,7 @@ class TestActivityCenterMultipleDevicePR(MultipleSharedDeviceTestCase):
|
|||
self.errors.verify_no_errors()
|
||||
|
||||
@marks.testrail_id(702851)
|
||||
@marks.xfail(reason='blocked by #14798')
|
||||
def test_activity_center_mentions_in_community_jump_to(self):
|
||||
self.device_2.just_fyi('Device2 sends a contact request to Device1')
|
||||
self.home_2.browser_tab.click()
|
||||
|
|
|
@ -751,7 +751,7 @@ class ChatView(BaseView):
|
|||
|
||||
# New UI
|
||||
self.pinned_messages_count = Button(self.driver,
|
||||
xpath="//*[@content-desc='pins-count']/android.widget.TextView")
|
||||
xpath="//*[@content-desc='pins-count']//android.widget.TextView")
|
||||
self.pinned_messages_list = PinnedMessagesList(self.driver)
|
||||
self.pin_limit_popover = BaseElement(self.driver, accessibility_id="pin-limit-popover")
|
||||
self.view_pinned_messages_button = Button(self.driver, accessibility_id="view-pinned-messages")
|
||||
|
|
Loading…
Reference in New Issue