Fix issue with "--rcs" (reuse class session)

Author: mdmintz

seleniumbase/core/session_helper.py

@@ -1,5 +1,4 @@
 from seleniumbase import config as sb_config
-from seleniumbase.fixtures import shared_utils
 
 
 def end_reused_class_session_as_needed():
@@ -10,11 +9,8 @@ def end_reused_class_session_as_needed():
         and sb_config.shared_driver
     ):
         if (
-            not shared_utils.is_windows()
-            or (
-                hasattr(sb_config.shared_driver, "service")
-                and sb_config.shared_driver.service.process
-            )
+            hasattr(sb_config.shared_driver, "service")
+            and sb_config.shared_driver.service.process
         ):
             try:
                 sb_config.shared_driver.quit()

seleniumbase/plugins/pytest_plugin.py

@@ -1552,6 +1552,7 @@ def pytest_configure(config):
     sb_config._SMALL_TIMEOUT = settings.SMALL_TIMEOUT
     sb_config._LARGE_TIMEOUT = settings.LARGE_TIMEOUT
     sb_config.pytest_html_report = config.getoption("htmlpath")  # --html=FILE
+    sb_config._sb_class = None  # (Used with the sb fixture for "--rcs")
     sb_config._sb_node = {}  # sb node dictionary (Used with the sb fixture)
     # Dashboard-specific variables
     sb_config._results = {}  # SBase Dashboard test results
@@ -2178,6 +2179,7 @@ def sb(request):
     Usage example: "def test_one(sb):"
     You may need to use this for tests that use other pytest fixtures."""
     from seleniumbase import BaseCase
+    from seleniumbase.core import session_helper
 
     class BaseClass(BaseCase):
         def setUp(self):
@@ -2191,6 +2193,11 @@ def base_method(self):
             pass
 
     if request.cls:
+        if sb_config.reuse_class_session:
+            the_class = str(request.cls).split(".")[-1].split("'")[0]
+            if the_class != sb_config._sb_class:
+                session_helper.end_reused_class_session_as_needed()
+                sb_config._sb_class = the_class
         request.cls.sb = BaseClass("base_method")
         request.cls.sb.setUp()
         request.cls.sb._needs_tearDown = True