added new property to skip remote tests

Author: sandeepsuryaprasad

py/conftest.py

@@ -286,6 +286,12 @@ def _initialize_driver(self):
             kwargs["service"] = self.service
         return getattr(webdriver, self.driver_class)(**kwargs)
 
+    @property
+    def skip_remote_tests(self):
+        if self._request.node.path.parts[-2] == "remote" and self.driver_class != "Remote":
+            return True
+        return False
+
     @property
     def stop_driver(self):
         def fin():
@@ -312,7 +318,7 @@ def driver(request):
         pytest.skip(f"{driver_class} tests can only run on {selenium_driver.exe_platform}")
 
     # skip tests in the 'remote' directory if run with a local driver
-    if request.node.path.parts[-2] == "remote" and selenium_driver.driver_class != "Remote":
+    if selenium_driver.skip_remote_tests:
         pytest.skip(f"Remote tests can't be run with driver '{selenium_driver.driver_class}'")
 
     # skip tests for drivers that don't support BiDi when --bidi is enabled
@@ -460,16 +466,15 @@ def clean_options(request):
 
 @pytest.fixture
 def firefox_options(request):
-    _supported_drivers = SupportedDrivers()
     try:
         driver_class = request.config.option.drivers[0]
     except (AttributeError, TypeError):
         raise Exception("This test requires a --driver to be specified")
 
     # skip tests in the 'remote' directory if run with a local driver
-    _driver_class = getattr(_supported_drivers, driver_class.lower())
-    if request.node.path.parts[-2] == "remote" and _driver_class != "Remote":
-        pytest.skip(f"Remote tests can't be run with driver '{_driver_class}'")
+    selenium_driver = Driver(driver_class, request)
+    if selenium_driver.skip_remote_tests:
+        pytest.skip(f"Remote tests can't be run with driver '{driver_class}'")
 
     options = webdriver.FirefoxOptions()
     if request.config.option.headless: