Refactoring

Author: mdmintz

seleniumbase/core/log_helper.py

@@ -8,6 +8,10 @@
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 
+python3_11_or_newer = False
+if sys.version_info >= (3, 11):
+    python3_11_or_newer = True
+
 
 def log_screenshot(test_logpath, driver, screenshot=None, get=False):
     screenshot_name = settings.SCREENSHOT_NAME
@@ -75,7 +79,7 @@ def get_master_time():
 
 
 def get_browser_version(driver):
-    if sys.version_info >= (3, 11) and hasattr(sb_config, "_browser_version"):
+    if python3_11_or_newer and hasattr(sb_config, "_browser_version"):
         return sb_config._browser_version
     driver_capabilities = driver.capabilities
     if "version" in driver_capabilities:

seleniumbase/fixtures/base_case.py

@@ -86,6 +86,9 @@ def test_anything(self):
     python3 = False
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf8")
+python3_11_or_newer = False
+if sys.version_info >= (3, 11):
+    python3_11_or_newer = True
 selenium4_or_newer = False
 if sys.version_info >= (3, 7):
     selenium4_or_newer = True
@@ -116,7 +119,7 @@ def __initialize_variables(self):
         self.__last_saved_url = None  # Used by Recorder-Mode
         self.__called_setup = False
         self.__called_teardown = False
-        self.__start_time_ms = None
+        self.__start_time_ms = int(time.time() * 1000.0)
         self.__requests_timeout = None
         self.__screenshot_count = 0
         self.__level_0_visual_f = False
@@ -173,9 +176,9 @@ def open(self, url):
         self.__check_scope()
         self.__check_browser()
         if self.__needs_minimum_wait():
-            time.sleep(0.025)
+            time.sleep(0.026)
             if self.undetectable:
-                time.sleep(0.025)
+                time.sleep(0.024)
         pre_action_url = None
         try:
             pre_action_url = self.driver.current_url
@@ -490,26 +493,26 @@ def click(
             except Exception:
                 pass
             if self.__needs_minimum_wait():
-                time.sleep(0.025)
+                time.sleep(0.026)
                 if self.undetectable:
-                    time.sleep(0.025)
+                    time.sleep(0.024)
             try:
                 if self.driver.current_url != pre_action_url:
                     self.__ad_block_as_needed()
                     self.__disable_beforeunload_as_needed()
                     if self.__needs_minimum_wait():
-                        time.sleep(0.025)
+                        time.sleep(0.026)
                         if self.undetectable:
-                            time.sleep(0.025)
+                            time.sleep(0.024)
             except Exception:
                 try:
                     self.wait_for_ready_state_complete()
                 except Exception:
                     pass
                 if self.__needs_minimum_wait():
-                    time.sleep(0.025)
+                    time.sleep(0.026)
                     if self.undetectable:
-                        time.sleep(0.025)
+                        time.sleep(0.024)
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()
@@ -2154,7 +2157,7 @@ def switch_to_frame_of_element(self, selector, by="css selector"):
         May not work if multiple iframes are nested within each other."""
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
-            time.sleep(0.02)
+            time.sleep(0.04)
         selector, by = self.__recalculate_selector(selector, by)
         if self.is_element_present(selector, by=by):
             return None
@@ -2920,14 +2923,14 @@ def switch_to_frame(self, frame, timeout=None):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         if self.__needs_minimum_wait():
-            time.sleep(0.035)
+            time.sleep(0.04)
         if type(frame) is str and self.is_element_visible(frame):
             try:
                 self.scroll_to(frame, timeout=1)
                 if self.__needs_minimum_wait():
-                    time.sleep(0.01)
+                    time.sleep(0.02)
             except Exception:
-                time.sleep(0.01)
+                time.sleep(0.02)
         else:
             if self.__needs_minimum_wait():
                 time.sleep(0.04)
@@ -5712,9 +5715,9 @@ def get_unique_links(self):
         """
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
-            time.sleep(0.05)
+            time.sleep(0.08)
             if self.undetectable:
-                time.sleep(0.05)
+                time.sleep(0.02)
         try:
             self.wait_for_element_present("body", timeout=1.5)
             self.wait_for_element_visible("body", timeout=1.5)
@@ -6071,6 +6074,8 @@ def choose_file(
         element = self.wait_for_element_present(
             selector, by=by, timeout=timeout
         )
+        if self.__needs_minimum_wait():
+            time.sleep(0.08)  # Force a minimum wait, even if skipping waits.
         if self.is_element_visible(selector, by=by):
             self.__demo_mode_highlight_if_active(selector, by)
             if not self.demo_mode and not self.slow_mode:
@@ -8866,7 +8871,7 @@ def __assert_eq(self, *args, **kwargs):
             raise VisualException(minified_exception)
 
     def _process_visual_baseline_logs(self):
-        if sys.version_info < (3, 11):
+        if not python3_11_or_newer:
             return
         self.__process_visual_baseline_logs()
 
@@ -8991,14 +8996,14 @@ def check_window(
             self.check_window(name="wikipedia_page", level=3)
         """
         self.wait_for_ready_state_complete()
-        if self.__needs_minimum_wait():
-            time.sleep(0.05)  # Force a minimum wait, even if skipping waits.
         try:
             self.wait_for_element_visible(
                 "body", timeout=settings.MINI_TIMEOUT
             )
         except Exception:
             pass
+        if self.__needs_minimum_wait():
+            time.sleep(0.08)
         if level == "0":
             level = 0
         if level == "1":
@@ -11780,7 +11785,7 @@ def __click_with_offset(
 
         self.wait_for_ready_state_complete()
         if self.__needs_minimum_wait():
-            time.sleep(0.05)  # Force a minimum wait, even if skipping waits.
+            time.sleep(0.08)  # Force a minimum wait, even if skipping waits.
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
@@ -13534,7 +13539,7 @@ def __insert_test_result(self, state, err):
         self.testcase_manager.update_testcase_data(data_payload)
 
     def _add_pytest_html_extra(self):
-        if sys.version_info < (3, 11):
+        if not python3_11_or_newer:
             return
         self.__add_pytest_html_extra()
 
@@ -14179,7 +14184,7 @@ def save_teardown_screenshot(self):
         if (
             self.__has_exception()
             or self.save_screenshot_after_test
-            or sys.version_info >= (3, 11)
+            or python3_11_or_newer
         ):
             self.__set_last_page_screenshot()
             self.__set_last_page_url()
@@ -14189,7 +14194,7 @@ def save_teardown_screenshot(self):
                     self.__add_pytest_html_extra()
 
     def _log_fail_data(self):
-        if sys.version_info < (3, 11):
+        if not python3_11_or_newer:
             return
         test_id = self.__get_test_id()
         test_logpath = os.path.join(self.log_path, test_id)
@@ -14348,7 +14353,7 @@ def tearDown(self):
                     )
                     self.__add_pytest_html_extra()
                     sb_config._has_logs = True
-                elif sys.version_info >= (3, 11) and not has_exception:
+                elif python3_11_or_newer and not has_exception:
                     # Handle a bug on Python 3.11 where exceptions aren't seen
                     self.__set_last_page_screenshot()
                     self.__set_last_page_url()

seleniumbase/plugins/base_plugin.py

@@ -14,6 +14,10 @@
 from seleniumbase.core import report_helper
 from seleniumbase.fixtures import constants
 
+python3_11_or_newer = False
+if sys.version_info >= (3, 11):
+    python3_11_or_newer = True
+
 
 class Base(Plugin):
     """
@@ -307,7 +311,7 @@ def add_fails_or_errors(self, test, err):
                     test, self.test_count, self.duration
                 )
             )
-        if sys.version_info >= (3, 11):
+        if python3_11_or_newer:
             # Handle a bug on Python 3.11 where exceptions aren't seen
             sb_config._browser_version = None
             try:

seleniumbase/plugins/pytest_plugin.py

@@ -19,6 +19,9 @@
 python3 = True
 if sys.version_info[0] < 3:
     python3 = False
+python3_11_or_newer = False
+if sys.version_info >= (3, 11):
+    python3_11_or_newer = True
 sys_argv = sys.argv
 pytest_plugins = ["pytester"]  # Adds the "testdir" fixture
 
@@ -2121,7 +2124,7 @@ def pytest_runtest_makereport(item, call):
                 sb_config._extra_dash_entries.append(test_id)
         elif (
             sb_config._sbase_detected
-            and sys.version_info >= (3, 11)
+            and python3_11_or_newer
             and (report.outcome == "failed" or "AssertionError" in str(call))
             and not sb_config._has_exception
         ):