From 136c3c0032da96a2c9d33309df040fcc1f4c3710 Mon Sep 17 00:00:00 2001
From: Yevheniia Berdnyk <ie.berdnyk@gmail.com>
Date: Tue, 25 Jun 2024 19:06:19 +0300
Subject: [PATCH] e2e: fixed KeyError for missed SauceLabs session id

---
 test/appium/support/github_report.py          |  9 ++++++---
 test/appium/support/testrail_report.py        | 19 ++++++++++++++-----
 .../old_ui/medium/test_browser_profile.py     |  6 +++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/test/appium/support/github_report.py b/test/appium/support/github_report.py
index 50e5cb69cf..9a1a37a868 100644
--- a/test/appium/support/github_report.py
+++ b/test/appium/support/github_report.py
@@ -160,10 +160,13 @@ class GithubHtmlReport(BaseTestReport):
             html += "Device %d:" % i
             html += "<ul>"
             if test_run.first_commands:
-                html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % \
-                        self.get_sauce_job_url(job_id, test_run.first_commands[job_id])
+                try:
+                    first_command = test_run.first_commands[job_id]
+                except KeyError:
+                    first_command = 0
             else:
-                html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id)
+                first_command = 0
+            html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id, first_command)
             # if test_run.error:
             #     html += "<li><a href=\"%s\">Failure screenshot</a></li>" % self.get_sauce_final_screenshot_url(job_id)
             html += "</ul></p>"
diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py
index e6ad5de354..63e6114c22 100644
--- a/test/appium/support/testrail_report.py
+++ b/test/appium/support/testrail_report.py
@@ -190,7 +190,10 @@ class TestrailReport(BaseTestReport):
                 test_steps += step + "\n"
             for i, device in enumerate(last_testrun.jobs):
                 if last_testrun.first_commands:
-                    first_command = last_testrun.first_commands[device]
+                    try:
+                        first_command = last_testrun.first_commands[device]
+                    except KeyError:
+                        first_command = 0
                 else:
                     first_command = 0
                 try:
@@ -233,7 +236,10 @@ class TestrailReport(BaseTestReport):
                     continue
                 for res in results:
                     if last_testrun.first_commands:
-                        pattern = r"%s\?auth=.*#%s" % (device, str(last_testrun.first_commands[device]))
+                        try:
+                            pattern = r"%s\?auth=.*#%s" % (device, str(last_testrun.first_commands[device]))
+                        except KeyError:
+                            pattern = device
                     else:
                         pattern = device
                     if re.findall(pattern, res['comment']):
@@ -285,10 +291,13 @@ class TestrailReport(BaseTestReport):
                         error = "```%s```\n **%s**  \n" % (code_error, no_code_error_str)
                     for job_id, f in last_testrun.jobs.items():
                         if last_testrun.first_commands:
-                            job_url = self.get_sauce_job_url(job_id=job_id,
-                                                             first_command=last_testrun.first_commands[job_id])
+                            try:
+                                first_command = last_testrun.first_commands[job_id]
+                            except KeyError:
+                                first_command = 0
                         else:
-                            job_url = self.get_sauce_job_url(job_id=job_id)
+                            first_command = 0
+                        job_url = self.get_sauce_job_url(job_id=job_id, first_command=first_command)
                         case_info = "Logs for device %d: [steps](%s), [failure screenshot](%s)" \
                                     % (f, job_url, self.get_sauce_final_screenshot_url(job_id))
 
diff --git a/test/appium/tests/old_ui/medium/test_browser_profile.py b/test/appium/tests/old_ui/medium/test_browser_profile.py
index 685876545b..c0416c1d7e 100644
--- a/test/appium/tests/old_ui/medium/test_browser_profile.py
+++ b/test/appium/tests/old_ui/medium/test_browser_profile.py
@@ -2,7 +2,7 @@ import time
 
 import pytest
 
-from tests import marks, common_password, used_fleet
+from tests import marks, common_password
 from tests.base_test_case import create_shared_drivers, MultipleSharedDeviceTestCase
 from views.sign_in_view import SignInView
 from tests.users import basic_user, ens_user, ens_user_message_sender, transaction_senders, chat_users
@@ -415,8 +415,8 @@ class TestBrowserProfileOneDevice(MultipleSharedDeviceTestCase):
         profile = self.home.profile_button.click()
         profile.advanced_button.click()
 
-        if not profile.element_by_text(used_fleet).is_element_displayed():
-            self.errors.append('%s is not selected by default' % used_fleet)
+        # if not profile.element_by_text(used_fleet).is_element_displayed():
+        #     self.errors.append('%s is not selected by default' % used_fleet)
 
         self.home.just_fyi('Set another fleet and check that changes are applied')
         profile.fleet_setting_button.click()