From ffb19025db1e61c1a10cf8520078fbe8fccfb752 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 24 Feb 2023 23:58:28 -0800 Subject: [PATCH] conftest updating --- tests/conftest.py | 5 +++-- tests/e2e/conftest.py | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index f1c1d589..c5985cf1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,6 +2,7 @@ import contextlib import json import logging import tempfile +from pathlib import Path from typing import Any from typing import Callable from typing import Dict @@ -14,13 +15,13 @@ from ytdl_sub.utils.logger import Logger @pytest.fixture -def working_directory() -> str: +def working_directory() -> Path: with tempfile.TemporaryDirectory() as temp_dir: yield temp_dir @pytest.fixture() -def output_directory(): +def output_directory() -> Path: with tempfile.TemporaryDirectory() as temp_dir: yield temp_dir diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py index 1e387f0f..de2cea83 100644 --- a/tests/e2e/conftest.py +++ b/tests/e2e/conftest.py @@ -3,6 +3,7 @@ import os import shutil import sys import tempfile +from pathlib import Path from typing import List from typing import Tuple from unittest.mock import patch @@ -48,11 +49,11 @@ def working_directory() -> str: @pytest.fixture() -def music_video_config_path(): - return "examples/music_videos_config.yaml" +def music_video_config_path() -> Path: + return Path("examples/music_videos_config.yaml") -def _load_config(config_path: str, working_directory: str) -> ConfigFile: +def _load_config(config_path: Path, working_directory: Path) -> ConfigFile: config_dict = load_yaml(file_path=config_path) config_dict["configuration"]["working_directory"] = working_directory @@ -75,14 +76,14 @@ def music_video_config_for_cli(music_video_config) -> str: @pytest.fixture() def channel_as_tv_show_config(working_directory) -> ConfigFile: return _load_config( - config_path="examples/tv_show_config.yaml", working_directory=working_directory + config_path=Path("examples/tv_show_config.yaml"), working_directory=working_directory ) @pytest.fixture() def music_audio_config(working_directory) -> ConfigFile: return _load_config( - config_path="examples/music_audio_config.yaml", working_directory=working_directory + config_path=Path("examples/music_audio_config.yaml"), working_directory=working_directory )