From b0336b0ce6ac2793de763b4b3d62cf70b8f41811 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Wed, 19 Feb 2020 14:19:45 +0100 Subject: [PATCH] use shutil.which() in SeleniumChromiumTestCase() --- django_tools/selenium/chromedriver.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/django_tools/selenium/chromedriver.py b/django_tools/selenium/chromedriver.py index b14bcde..45cc670 100644 --- a/django_tools/selenium/chromedriver.py +++ b/django_tools/selenium/chromedriver.py @@ -3,14 +3,15 @@ :copyleft: 2015-2020 by the django-tools team, see AUTHORS for more details. :license: GNU GPL v3 or above, see LICENSE for more details. """ + import logging +import shutil from selenium import webdriver from selenium.webdriver import DesiredCapabilities # https://github.com/jedie/django-tools from django_tools.selenium.base import SeleniumBaseTestCase -from django_tools.selenium.utils import find_executable log = logging.getLogger(__name__) @@ -40,12 +41,8 @@ def test_admin_login_page(self): see also: django_tools_tests/test_unittest_selenium.py """ - filename = "chromedriver" - # Overwrite this in sub class, if needed: - extra_search_paths = ("/usr/lib/chromium-browser",) - options = ("--no-sandbox", "--headless", "--disable-gpu") desired_capabilities = { "loggingPrefs": { @@ -66,7 +63,7 @@ def setUpClass(cls): options.add_argument(argument) try: - executable = find_executable(cls.filename, cls.extra_search_paths) + executable = shutil.which(cls.filename) except FileNotFoundError: cls.driver = None else: @@ -108,7 +105,7 @@ def chromium_available(filename=None): filename = SeleniumChromiumTestCase.filename try: - executable = find_executable(filename, SeleniumChromiumTestCase.extra_search_paths) + executable = shutil.which(filename) except FileNotFoundError as err: log.error("Chromium is no available: %s", err) return False