seleniumbase 4.33.3__tar.gz → 4.33.4__tar.gz

{seleniumbase-4.33.3/seleniumbase.egg-info → seleniumbase-4.33.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.33.3
+Version: 4.33.4
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -76,7 +76,7 @@ Requires-Dist: pynose>=1.5.3
 Requires-Dist: platformdirs>=4.3.6
 Requires-Dist: typing-extensions>=4.12.2
 Requires-Dist: sbvirtualdisplay>=1.3.0
-Requires-Dist: six>=1.16.0
+Requires-Dist: six>=1.17.0
 Requires-Dist: parse>=1.20.2
 Requires-Dist: parse-type>=0.6.4
 Requires-Dist: colorama>=0.4.6
@@ -104,9 +104,8 @@ Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: execnet==2.1.1
 Requires-Dist: iniconfig==2.0.0
 Requires-Dist: pluggy==1.5.0
-Requires-Dist: py==1.11.0
 Requires-Dist: pytest==8.3.4
-Requires-Dist: pytest-html==2.0.1
+Requires-Dist: pytest-html==4.1.1
 Requires-Dist: pytest-metadata==3.1.1
 Requires-Dist: pytest-ordering==0.6
 Requires-Dist: pytest-rerunfailures==14.0; python_version < "3.9"

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/pyproject.toml

@@ -56,7 +56,7 @@ packages = [
 ]
 
 [tool.pytest.ini_options]
-addopts = ["--capture=no", "-p no:cacheprovider"]
+addopts = ["--capture=tee-sys", "-p no:cacheprovider"]
 norecursedirs = [".*", "build", "dist", "recordings", "temp", "assets"]
 filterwarnings = [
     "ignore::pytest.PytestWarning",

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/pytest.ini

@@ -1,7 +1,7 @@
 [pytest]
 
 # Display console output. Disable cacheprovider:
-addopts = --capture=no -p no:cacheprovider
+addopts = --capture=tee-sys -p no:cacheprovider
 
 # Skip these directories during test collection:
 norecursedirs = .* build dist recordings temp assets

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/requirements.txt

@@ -15,7 +15,7 @@ pynose>=1.5.3
 platformdirs>=4.3.6
 typing-extensions>=4.12.2
 sbvirtualdisplay>=1.3.0
-six>=1.16.0
+six>=1.17.0
 parse>=1.20.2
 parse-type>=0.6.4
 colorama>=0.4.6
@@ -43,9 +43,8 @@ sortedcontainers==2.4.0
 execnet==2.1.1
 iniconfig==2.0.0
 pluggy==1.5.0
-py==1.11.0
 pytest==8.3.4
-pytest-html==2.0.1
+pytest-html==4.1.1
 pytest-metadata==3.1.1
 pytest-ordering==0.6
 pytest-rerunfailures==14.0;python_version<"3.9"

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.33.3"
+__version__ = "4.33.4"

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase/console_scripts/sb_mkdir.py

@@ -120,7 +120,7 @@ def main():
 
     data = []
     data.append("[pytest]")
-    data.append("addopts = --capture=no -p no:cacheprovider")
+    data.append("addopts = --capture=tee-sys -p no:cacheprovider")
     data.append("norecursedirs = .* build dist recordings temp assets")
     data.append("filterwarnings =")
     data.append("    ignore::pytest.PytestWarning")

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase/core/browser_launcher.py

@@ -97,6 +97,13 @@ def log_d(message):
         print(message)
 
 
+def make_writable(file_path):
+    # Set permissions to: "If you can read it, you can write it."
+    mode = os.stat(file_path).st_mode
+    mode |= (mode & 0o444) >> 1  # copy R bits to W
+    os.chmod(file_path, mode)
+
+
 def make_executable(file_path):
     # Set permissions to: "If you can read it, you can execute it."
     mode = os.stat(file_path).st_mode
@@ -815,6 +822,13 @@ def install_pyautogui_if_missing(driver):
     pip_find_lock = fasteners.InterProcessLock(
         constants.PipInstall.FINDLOCK
     )
+    try:
+        with pip_find_lock:
+            pass
+    except Exception:
+        # Need write permissions
+        with suppress(Exception):
+            make_writable(constants.PipInstall.FINDLOCK)
     with pip_find_lock:  # Prevent issues with multiple processes
         try:
             import pyautogui

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase/fixtures/base_case.py

@@ -13983,6 +13983,15 @@ class BaseCase(unittest.TestCase):
             pip_find_lock = fasteners.InterProcessLock(
                 constants.PipInstall.FINDLOCK
             )
+            try:
+                with pip_find_lock:
+                    pass
+            except Exception:
+                # Need write permissions
+                with suppress(Exception):
+                    mode = os.stat(constants.PipInstall.FINDLOCK).st_mode
+                    mode |= (mode & 0o444) >> 1  # copy R bits to W
+                    os.chmod(constants.PipInstall.FINDLOCK, mode)
             with pip_find_lock:  # Prevent issues with multiple processes
                 if self.undetectable and not (self.headless or self.headless2):
                     import Xlib.display

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase/plugins/pytest_plugin.py

@@ -17,6 +17,7 @@ if sys.version_info >= (3, 11):
     python3_11_or_newer = True
 py311_patch2 = constants.PatchPy311.PATCH
 sys_argv = sys.argv
+full_time = None
 pytest_plugins = ["pytester"]  # Adds the "testdir" fixture
 
 
@@ -2038,6 +2039,7 @@ def pytest_runtest_teardown(item):
         if (
             "-s" in sys_argv
             or "--capture=no" in sys_argv
+            or "--capture=tee-sys" in sys_argv
             or (
                 hasattr(sb_config.pytest_config, "invocation_params")
                 and (
@@ -2045,6 +2047,9 @@ def pytest_runtest_teardown(item):
                     or "--capture=no" in (
                         sb_config.pytest_config.invocation_params.args
                     )
+                    or "--capture=tee-sys" in (
+                        sb_config.pytest_config.invocation_params.args
+                    )
                 )
             )
         ):
@@ -2053,6 +2058,10 @@ def pytest_runtest_teardown(item):
             sys.stdout.write("\n=> Fail Page: %s\n" % sb_config._fail_page)
 
 
+def pytest_html_duration_format(duration):
+    return "%.2f" % duration
+
+
 def pytest_sessionfinish(session):
     pass
 
@@ -2103,9 +2112,11 @@ def pytest_terminal_summary(terminalreporter):
         )
 
 
-def _perform_pytest_unconfigure_():
+def _perform_pytest_unconfigure_(config):
     from seleniumbase.core import proxy_helper
 
+    reporter = config.pluginmanager.get_plugin("terminalreporter")
+    duration = time.time() - reporter._sessionstarttime
     if (
         (hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy)
         or not hasattr(sb_config, "multi_proxy")
@@ -2133,6 +2144,63 @@ def _perform_pytest_unconfigure_():
     log_helper.clear_empty_logs()
     # Dashboard post-processing: Disable time-based refresh and stamp complete
     if not hasattr(sb_config, "dashboard") or not sb_config.dashboard:
+        html_report_path = None
+        the_html_r = None
+        abs_path = os.path.abspath(".")
+        if sb_config._html_report_name:
+            html_report_path = os.path.join(
+                abs_path, sb_config._html_report_name
+            )
+        if (
+            sb_config._using_html_report
+            and html_report_path
+            and os.path.exists(html_report_path)
+        ):
+            with open(html_report_path, "r", encoding="utf-8") as f:
+                the_html_r = f.read()
+            assets_chunk = "if (assets.length === 1) {"
+            remove_media = "container.classList.remove('media-container')"
+            rm_n_left = '<div class="media-container__nav--left"><</div>'
+            rm_n_right = '<div class="media-container__nav--right">></div>'
+            the_html_r = the_html_r.replace(
+                assets_chunk,
+                "%s %s" % (assets_chunk, remove_media),
+            )
+            the_html_r = the_html_r.replace(rm_n_left, "")
+            the_html_r = the_html_r.replace(rm_n_right, "")
+            the_html_r = the_html_r.replace("<ul>$", "$")
+            the_html_r = the_html_r.replace("}<ul>", "}")
+            the_html_r = the_html_r.replace(
+                "<li>${val}</li>", "${val},&nbsp;&nbsp;"
+            )
+            the_html_r = the_html_r.replace(
+                "<div>${value}</div>", "<span>${value}</span"
+            )
+            ph_link = '<a href="https://pypi.python.org/pypi/pytest-html">'
+            sb_link = (
+                '<a href="https://github.com/seleniumbase/SeleniumBase">'
+                'SeleniumBase</a>'
+            )
+            the_html_r = the_html_r.replace(
+                ph_link, "%s and %s" % (sb_link, ph_link)
+            )
+            the_html_r = the_html_r.replace(
+                "mediaName.innerText", "//mediaName.innerText"
+            )
+            the_html_r = the_html_r.replace(
+                "counter.innerText", "//counter.innerText"
+            )
+            run_count = '<p class="run-count">'
+            run_c_loc = the_html_r.find(run_count)
+            rc_loc = the_html_r.find(" took ", run_c_loc)
+            end_rc_loc = the_html_r.find(".</p>", rc_loc)
+            run_time = "%.2f" % duration
+            new_time = " ran in %s seconds" % run_time
+            the_html_r = (
+                the_html_r[:rc_loc] + new_time + the_html_r[end_rc_loc:]
+            )
+            with open(html_report_path, "w", encoding="utf-8") as f:
+                f.write(the_html_r)  # Finalize the HTML report
         # Done with "pytest_unconfigure" unless using the Dashboard
         return
     stamp = ""
@@ -2237,7 +2305,7 @@ def _perform_pytest_unconfigure_():
                     elif "\\" in h_r_name and h_r_name.endswith(".html"):
                         h_r_name = h_r_name.split("\\")[-1]
                     the_html_r = the_html_r.replace(
-                        "<h1>%s</h1>" % h_r_name,
+                        '<h1 id="title">%s</h1>' % h_r_name,
                         sb_config._saved_dashboard_pie,
                     )
                     the_html_r = the_html_r.replace(
@@ -2247,6 +2315,47 @@ def _perform_pytest_unconfigure_():
                     )
                     if sb_config._dash_final_summary:
                         the_html_r += sb_config._dash_final_summary
+                assets_chunk = "if (assets.length === 1) {"
+                remove_media = "container.classList.remove('media-container')"
+                rm_n_left = '<div class="media-container__nav--left"><</div>'
+                rm_n_right = '<div class="media-container__nav--right">></div>'
+                the_html_r = the_html_r.replace(
+                    assets_chunk,
+                    "%s %s" % (assets_chunk, remove_media),
+                )
+                the_html_r = the_html_r.replace(rm_n_left, "")
+                the_html_r = the_html_r.replace(rm_n_right, "")
+                the_html_r = the_html_r.replace("<ul>$", "$")
+                the_html_r = the_html_r.replace("}<ul>", "}")
+                the_html_r = the_html_r.replace(
+                    "<li>${val}</li>", "${val},&nbsp;&nbsp;"
+                )
+                the_html_r = the_html_r.replace(
+                    "<div>${value}</div>", "<span>${value}</span"
+                )
+                ph_link = '<a href="https://pypi.python.org/pypi/pytest-html">'
+                sb_link = (
+                    '<a href="https://github.com/seleniumbase/SeleniumBase">'
+                    'SeleniumBase</a>'
+                )
+                the_html_r = the_html_r.replace(
+                    ph_link, "%s and %s" % (sb_link, ph_link)
+                )
+                the_html_r = the_html_r.replace(
+                    "mediaName.innerText", "//mediaName.innerText"
+                )
+                the_html_r = the_html_r.replace(
+                    "counter.innerText", "//counter.innerText"
+                )
+                run_count = '<p class="run-count">'
+                run_c_loc = the_html_r.find(run_count)
+                rc_loc = the_html_r.find(" took ", run_c_loc)
+                end_rc_loc = the_html_r.find(".</p>", rc_loc)
+                run_time = "%.2f" % duration
+                new_time = " ran in %s seconds" % run_time
+                the_html_r = (
+                    the_html_r[:rc_loc] + new_time + the_html_r[end_rc_loc:]
+                )
                 with open(html_report_path, "w", encoding="utf-8") as f:
                     f.write(the_html_r)  # Finalize the HTML report
     except KeyboardInterrupt:
@@ -2281,19 +2390,19 @@ def pytest_unconfigure(config):
                         with open(dashboard_path, "w", encoding="utf-8") as f:
                             f.write(sb_config._dash_html)
                     # Dashboard Multithreaded
-                    _perform_pytest_unconfigure_()
+                    _perform_pytest_unconfigure_(config)
                     return
             else:
                 # Dash Lock is missing
-                _perform_pytest_unconfigure_()
+                _perform_pytest_unconfigure_(config)
                 return
         with dash_lock:
             # Multi-threaded tests
-            _perform_pytest_unconfigure_()
+            _perform_pytest_unconfigure_(config)
             return
     else:
         # Single-threaded tests
-        _perform_pytest_unconfigure_()
+        _perform_pytest_unconfigure_(config)
         return
 
 
@@ -2442,7 +2551,7 @@ def pytest_runtest_makereport(item, call):
                 return
             extra = getattr(report, "extra", [])
             if len(extra_report) > 1 and extra_report[1]["content"]:
-                report.extra = extra + extra_report
+                report.extras = extra + extra_report
             if sb_config._dash_is_html_report:
                 # If the Dashboard URL is the same as the HTML Report URL,
                 # have the html report refresh back to a dashboard on update.
@@ -2450,4 +2559,4 @@ def pytest_runtest_makereport(item, call):
                     '<script type="text/javascript" src="%s">'
                     "</script>" % constants.Dashboard.LIVE_JS
                 )
-                report.extra.append(pytest_html.extras.html(refresh_updates))
+                report.extras.append(pytest_html.extras.html(refresh_updates))

{seleniumbase-4.33.3 → seleniumbase-4.33.4/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.33.3
+Version: 4.33.4
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -76,7 +76,7 @@ Requires-Dist: pynose>=1.5.3
 Requires-Dist: platformdirs>=4.3.6
 Requires-Dist: typing-extensions>=4.12.2
 Requires-Dist: sbvirtualdisplay>=1.3.0
-Requires-Dist: six>=1.16.0
+Requires-Dist: six>=1.17.0
 Requires-Dist: parse>=1.20.2
 Requires-Dist: parse-type>=0.6.4
 Requires-Dist: colorama>=0.4.6
@@ -104,9 +104,8 @@ Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: execnet==2.1.1
 Requires-Dist: iniconfig==2.0.0
 Requires-Dist: pluggy==1.5.0
-Requires-Dist: py==1.11.0
 Requires-Dist: pytest==8.3.4
-Requires-Dist: pytest-html==2.0.1
+Requires-Dist: pytest-html==4.1.1
 Requires-Dist: pytest-metadata==3.1.1
 Requires-Dist: pytest-ordering==0.6
 Requires-Dist: pytest-rerunfailures==14.0; python_version < "3.9"

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/seleniumbase.egg-info/requires.txt

@@ -11,7 +11,7 @@ pynose>=1.5.3
 platformdirs>=4.3.6
 typing-extensions>=4.12.2
 sbvirtualdisplay>=1.3.0
-six>=1.16.0
+six>=1.17.0
 parse>=1.20.2
 parse-type>=0.6.4
 colorama>=0.4.6
@@ -36,9 +36,8 @@ sortedcontainers==2.4.0
 execnet==2.1.1
 iniconfig==2.0.0
 pluggy==1.5.0
-py==1.11.0
 pytest==8.3.4
-pytest-html==2.0.1
+pytest-html==4.1.1
 pytest-metadata==3.1.1
 pytest-ordering==0.6
 pytest-xdist==3.6.1

{seleniumbase-4.33.3 → seleniumbase-4.33.4}/setup.py

@@ -164,7 +164,7 @@ setup(
         'platformdirs>=4.3.6',
         'typing-extensions>=4.12.2',
         "sbvirtualdisplay>=1.3.0",
-        "six>=1.16.0",
+        "six>=1.17.0",
         'parse>=1.20.2',
         'parse-type>=0.6.4',
         'colorama>=0.4.6',
@@ -192,9 +192,8 @@ setup(
         'execnet==2.1.1',
         'iniconfig==2.0.0',
         'pluggy==1.5.0',
-        "py==1.11.0",  # Needed by pytest-html
         'pytest==8.3.4',
-        "pytest-html==2.0.1",  # Newer ones had issues
+        "pytest-html==4.1.1",
         'pytest-metadata==3.1.1',
         "pytest-ordering==0.6",
         'pytest-rerunfailures==14.0;python_version<"3.9"',