Refactoring

Author: mdmintz

seleniumbase/core/log_helper.py

@@ -10,6 +10,7 @@
 python3_11_or_newer = False
 if sys.version_info >= (3, 11):
     python3_11_or_newer = True
+py311_patch2 = constants.PatchPy311.PATCH
 
 
 def log_screenshot(test_logpath, driver, screenshot=None, get=False):
@@ -79,7 +80,11 @@ def get_master_time():
 
 
 def get_browser_version(driver):
-    if python3_11_or_newer and hasattr(sb_config, "_browser_version"):
+    if (
+        python3_11_or_newer
+        and py311_patch2
+        and hasattr(sb_config, "_browser_version")
+    ):
         return sb_config._browser_version
     driver_capabilities = driver.capabilities
     if "version" in driver_capabilities:
@@ -187,6 +192,25 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
             traceback_list = traceback.format_list(
                 traceback.extract_tb(traceback_address)[1:]
             )
+            updated_list = []
+            counter = 0
+            for traceback_item in traceback_list:
+                if "self._callTestMethod(testMethod)" in traceback_item:
+                    counter = 1
+                    updated_list.append(traceback_item)  # In case not cleared
+                    continue
+                elif (
+                    ", in _callTestMethod" in traceback_item.strip()
+                    and "method()" in traceback_item.strip()
+                    and counter == 1
+                ):
+                    counter = 0
+                    updated_list = []
+                    continue
+                else:
+                    counter = 0
+                    updated_list.append(traceback_item)
+            traceback_list = updated_list
             traceback_message = "".join(traceback_list).strip()
         except Exception:
             exc_message = "(Unknown Exception)"
@@ -201,13 +225,17 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
                 if sb_config.behave_step.error_message:
                     traceback_message = sb_config.behave_step.error_message
         else:
-            traceback_message = "".join(
-                traceback.format_exception(
-                    sys.exc_info()[0],
-                    sys.exc_info()[1],
-                    sys.exc_info()[2],
-                )
+            format_exception = traceback.format_exception(
+                sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2]
             )
+            if format_exception:
+                updated_list = []
+                for line in format_exception:
+                    if "sb_manager.py" in line and "yield sb" in line:
+                        continue
+                    updated_list.append(line)
+                format_exception = updated_list
+            traceback_message = "".join(format_exception)
         if (
             not traceback_message
             or len(str(traceback_message)) < 30