Skip to content

Commit f4264bd

Browse files
committed
Modified method for getting driver path within atests
1 parent e6d7b6c commit f4264bd

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

atest/resources/testlibs/get_driver_path.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,21 @@ def _import_options(self, browser):
2121
from selenium import webdriver
2222
from selenium.webdriver.common import driver_finder
2323
import importlib
24+
import inspect
2425

2526

2627
def get_driver_path(browser):
2728
browser = browser.lower().replace("headless_", "", 1)
2829
service = importlib.import_module(f"selenium.webdriver.{browser}.service")
2930
options = importlib.import_module(f"selenium.webdriver.{browser}.options")
30-
# finder = driver_finder.DriverFinder()
3131

32-
# Selenium v4.19.0 and prior
33-
try:
32+
args = inspect.signature(driver_finder.DriverFinder.__init__).parameters.keys()
33+
if ('service' in args) and ('options' in args):
34+
# Selenium V4.20.0 or greater
35+
finder = driver_finder.DriverFinder(service.Service(), options.Options())
36+
return finder.get_driver_path()
37+
else:
38+
# Selenium v4.19.0 and prior
3439
finder = driver_finder.DriverFinder()
3540
func = getattr(finder, 'get_path')
3641
return finder.get_path(service.Service(), options.Options())
37-
except (AttributeError, TypeError):
38-
pass
39-
40-
# Selenium V4.20.0
41-
try:
42-
finder = driver_finder.DriverFinder(service.Service(), options.Options())
43-
return finder.get_driver_drivepath()
44-
except:
45-
pass
46-
47-
raise Exception('Unable to determine driver path')

0 commit comments

Comments
 (0)