From 0a977abf65ffcc3b7804af5185f2f1e85d4c8837 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 24 Nov 2023 17:56:11 +0100 Subject: [PATCH] move ENV_Files to main.py --- main.py | 15 +++++++++++++-- src/wrapper.py | 11 +---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/main.py b/main.py index 4d18d4d..dc2a66c 100644 --- a/main.py +++ b/main.py @@ -1,11 +1,22 @@ import os +from pathlib import Path from src.utils import get_session_id -from src.wrapper import ENV_FILES, Wrapper +from src.wrapper import Wrapper + +ENV_FILES = [ + Path("envfiles/login.test.dev.local-it.cloud.env"), # authentik + # Path("envfiles/blog.test.dev.local-it.cloud.env"), # wordpress +] + +TESTS_DIR = Path("./tests").resolve() + # Set environment variables -os.environ["PWDEBUG"] = "1" +# os.environ["PWDEBUG"] = "1" +os.environ["TESTS_DIR"] = str(TESTS_DIR) + session_id = get_session_id() wrapper = Wrapper(ENV_FILES, session_id=session_id) diff --git a/src/wrapper.py b/src/wrapper.py index 700a452..5b40bd8 100644 --- a/src/wrapper.py +++ b/src/wrapper.py @@ -1,21 +1,12 @@ -from datetime import datetime from pathlib import Path from typing import Protocol from dotenv import dotenv_values -from icecream import ic from src.dirmanager import DirManager from src.tests_authentik.runner_authentik import RunnerAuthentik from src.tests_wordpress.runner_wordpress import RunnerWordpress -TESTS_DIR = Path("./tests").resolve() - -ENV_FILES = [ - Path("envfiles/login.test.dev.local-it.cloud.env"), # authentik - # Path("envfiles/blog.test.dev.local-it.cloud.env"), # wordpress -] - class TestRunner(Protocol): def __init__(self, dotenv_path: Path, tests_dir: Path, session_id: str): @@ -55,7 +46,7 @@ class Wrapper: def _load_runners(self, env_files: list[Path]) -> list[TestRunner]: runners = [] for env_file in env_files: - config: dict[str, str] = dotenv_values(env_file) + config: dict[str, str] = dotenv_values(env_file) # type: ignore RunnerClass = RUNNER_DICT[config["TYPE"]] runners.append(RunnerClass(dotenv_path=env_file, tests_dir=TESTS_DIR, session_id=self.session_id)) return runners