diff --git a/pytest_abra/__init__.py b/pytest_abra/__init__.py index 0b134ec..5ec5233 100644 --- a/pytest_abra/__init__.py +++ b/pytest_abra/__init__.py @@ -1,6 +1,6 @@ from pytest_abra.coordinator import Coordinator from pytest_abra.dir_manager import DirManager -from pytest_abra.env_manager import EnvFile +from pytest_abra.env_manager import EnvFile, EnvManager from pytest_abra.runner import ConditionArgs, Runner, Test from pytest_abra.utils import BaseUrl @@ -12,4 +12,5 @@ __all__ = [ "DirManager", "BaseUrl", "EnvFile", + "EnvManager", ] diff --git a/pytest_abra/coordinator.py b/pytest_abra/coordinator.py index 8819388..738f084 100644 --- a/pytest_abra/coordinator.py +++ b/pytest_abra/coordinator.py @@ -6,10 +6,8 @@ from pathlib import Path from loguru import logger -from pytest_abra.dir_manager import DirManager -from pytest_abra.env_manager import EnvFile, EnvManager +from pytest_abra import DirManager, EnvFile, EnvManager, Runner from pytest_abra.html_helper import merge_html_reports -from pytest_abra.runner import Runner from pytest_abra.utils import generate_random_string, load_json_to_environ, rmtree diff --git a/pytest_abra/env_manager.py b/pytest_abra/env_manager.py index f9d79cd..ab3754a 100644 --- a/pytest_abra/env_manager.py +++ b/pytest_abra/env_manager.py @@ -5,8 +5,7 @@ from typing import TYPE_CHECKING, NamedTuple from dotenv import dotenv_values if TYPE_CHECKING: - from pytest_abra.dir_manager import DirManager - from pytest_abra.runner import Runner + from pytest_abra import DirManager, Runner class EnvFile(NamedTuple): diff --git a/pytest_abra/runner.py b/pytest_abra/runner.py index 251068a..72561ac 100644 --- a/pytest_abra/runner.py +++ b/pytest_abra/runner.py @@ -7,9 +7,7 @@ import pytest from loguru import logger if TYPE_CHECKING: - from pytest_abra import DirManager - from pytest_abra.coordinator import Coordinator - from pytest_abra.env_manager import EnvFile + from pytest_abra import Coordinator, DirManager, EnvFile class ConditionArgs(NamedTuple): diff --git a/recipes/authentik/tests_authentik/setup_authentik.py b/recipes/authentik/tests_authentik/setup_authentik.py index 96e72e8..5fbde7a 100644 --- a/recipes/authentik/tests_authentik/setup_authentik.py +++ b/recipes/authentik/tests_authentik/setup_authentik.py @@ -4,8 +4,7 @@ import re from playwright.sync_api import BrowserContext, expect -from pytest_abra.dir_manager import DirManager -from pytest_abra.utils import BaseUrl +from pytest_abra import BaseUrl, DirManager ADMIN_USER = os.environ["ADMIN_USER"] ADMIN_PASS = os.environ["ADMIN_PASS"] diff --git a/recipes/nextcloud/tests_nextcloud/conftest.py b/recipes/nextcloud/tests_nextcloud/conftest.py index ce56379..4151c7a 100644 --- a/recipes/nextcloud/tests_nextcloud/conftest.py +++ b/recipes/nextcloud/tests_nextcloud/conftest.py @@ -4,8 +4,7 @@ import os import pytest from playwright.sync_api import BrowserContext, Page -from pytest_abra.dir_manager import DirManager -from pytest_abra.utils import BaseUrl +from pytest_abra import BaseUrl, DirManager pytest_plugins = "authentik.tests_authentik.fixtures_authentik" diff --git a/recipes/nextcloud/tests_nextcloud/setup_nextcloud.py b/recipes/nextcloud/tests_nextcloud/setup_nextcloud.py index 64c8e94..3f18b2c 100644 --- a/recipes/nextcloud/tests_nextcloud/setup_nextcloud.py +++ b/recipes/nextcloud/tests_nextcloud/setup_nextcloud.py @@ -2,8 +2,7 @@ import re from playwright.sync_api import Page, expect -from pytest_abra.dir_manager import DirManager -from pytest_abra.utils import BaseUrl +from pytest_abra import BaseUrl, DirManager # url dashboard # https://files.test.dev.local-it.cloud/apps/dashboard/