From 259cfdba30493c8835cba746683b0f14caefe0cf Mon Sep 17 00:00:00 2001 From: Aleksandr Kotlyar Date: Thu, 24 Mar 2022 20:10:30 +0300 Subject: [PATCH] gh #356 codecov opera.py (#358) - optimize if/else in opera.py::OperaDriverManager::install() also: - move code from tests/utils.py to test_downloader.py - remove 3.13.0, 3.141.59 from test_ie_driver.py as unnecessary - add project's .gitignore --- .gitignore | 8 ++++++++ tests/test_downloader.py | 6 ++++-- tests/test_ie_driver.py | 3 --- tests/utils.py | 5 ----- webdriver_manager/opera.py | 11 ++++------- 5 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 tests/utils.py diff --git a/.gitignore b/.gitignore index 1564047a..b46d641c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +# Project +ssl_disabled/ +custom/ +.venv*/ +venv*/ +drivers/ +drivers.json + # Created by .ignore support plugin (hsz.mobi) ### Python template # Byte-compiled / optimized / DLL files diff --git a/tests/test_downloader.py b/tests/test_downloader.py index bab3ec7a..10a9eadf 100644 --- a/tests/test_downloader.py +++ b/tests/test_downloader.py @@ -3,10 +3,13 @@ import pytest -from tests.utils import driver_directory from webdriver_manager.driver import ChromeDriver from webdriver_manager.utils import download_file, save_file, ChromeType +project_root = os.path.dirname(os.path.dirname(__file__)) + +driver_directory = f"{project_root}{os.sep}.drivers" + @pytest.fixture() def delete_drivers_dir(): @@ -42,4 +45,3 @@ def test_can_download_chrome_driver(delete_drivers_dir, version): assert file.filename == "driver.zip" archive = save_file(file, driver_directory) assert archive.unpack(driver_directory) == ["chromedriver.exe"] - diff --git a/tests/test_ie_driver.py b/tests/test_ie_driver.py index 3dfeea26..e955d743 100644 --- a/tests/test_ie_driver.py +++ b/tests/test_ie_driver.py @@ -6,10 +6,7 @@ @pytest.mark.parametrize("version", [ - "2.53.1", "3.0", - "3.13.0", - "3.141.59", "3.150.0", # "3.150.1", # "3.150.2", diff --git a/tests/utils.py b/tests/utils.py deleted file mode 100644 index 832f776f..00000000 --- a/tests/utils.py +++ /dev/null @@ -1,5 +0,0 @@ -import os - -project_root = os.path.dirname(os.path.dirname(__file__)) - -driver_directory = f"{project_root}{os.sep}.drivers" diff --git a/webdriver_manager/opera.py b/webdriver_manager/opera.py index c797b111..ff5dd275 100755 --- a/webdriver_manager/opera.py +++ b/webdriver_manager/opera.py @@ -31,14 +31,11 @@ def __init__(self, version="latest", def install(self): driver_path = self._get_driver_path(self.driver) - if os.path.isfile(driver_path): - os.chmod(driver_path, 0o755) - return driver_path - else: + if not os.path.isfile(driver_path): for name in os.listdir(driver_path): if 'sha512_sum' in name: os.remove(os.path.join(driver_path, name)) break - file_path = os.path.join(driver_path, os.listdir(driver_path)[0]) - os.chmod(file_path, 0o755) - return file_path + driver_path = os.path.join(driver_path, os.listdir(driver_path)[0]) + os.chmod(driver_path, 0o755) + return driver_path