Skip to content

FIX: Implement atexit to stop browser #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2023
Merged

FIX: Implement atexit to stop browser #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d30d8
STYLE: Implement Exception in try/except
kayqueGovetri Nov 21, 2023
ed935f5
TST: Implement cache manager in conftest
kayqueGovetri Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions botcity/web/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from __future__ import annotations

import atexit
import base64
import functools
import glob
Expand Down Expand Up @@ -25,6 +28,7 @@
from selenium.webdriver.remote.webelement import WebElement
from selenium.webdriver.support.wait import WebDriverWait, TimeoutException, NoSuchElementException
from selenium.webdriver.support import expected_conditions as EC
from weakref import ReferenceType, ref

from . import config, cv2find
from .browsers import BROWSER_CONFIGS, Browser, PageLoadStrategy
Expand All @@ -39,6 +43,14 @@
logger = logging.getLogger(__name__)


def _cleanup(bot: ReferenceType[WebBot]):
if bot() is not None:
try:
bot().stop_browser()
except Exception:
pass


class WebBot(BaseBot):
KEYS = Keys
DEFAULT_DIMENSIONS = (1600, 900)
Expand Down Expand Up @@ -77,6 +89,8 @@ def __init__(self, headless=False):

self._download_folder_path = os.getcwd()

atexit.register(_cleanup, ref(self))

def __enter__(self):
pass

Expand Down
4 changes: 3 additions & 1 deletion conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import typing
import platform

from webdriver_manager.core.driver_cache import DriverCacheManager
from botcity.web import WebBot, Browser, By, browsers
from webdriver_manager.chrome import ChromeDriverManager
from webdriver_manager.firefox import GeckoDriverManager
Expand Down Expand Up @@ -97,7 +98,8 @@ def download_driver(request):
folder_driver = tempfile.mkdtemp()
browser = request.config.getoption("--browser") or Browser.CHROME
manager = factory_driver_manager(browser=browser)
installed_driver = manager(path=folder_driver).install()
cache_manager = DriverCacheManager(root_dir=folder_driver)
installed_driver = manager(cache_manager=cache_manager).install()
yield installed_driver
shutil.rmtree(folder_driver)

Expand Down