add tests

Author: saxix

.pre-commit-config.yaml

@@ -9,11 +9,6 @@ repos:
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
-  #  - repo: https://github.com/codespell-project/codespell
-  #    rev: v2.4.0
-  #    hooks:
-  #      - id: codespell
-  #        additional_dependencies: ["tomli>=2.0.1"]
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: "1.5.0"
     hooks:

pyproject.toml

@@ -114,8 +114,10 @@ max_supported_python = "3.13"
 addopts = "-ra -q"
 testpaths = [
   "tests",
-  "integration",
 ]
+#echo_envs = ["ENV1", "ENV2"]
+#echo_attributes = []
+#echo_versions = ["pytest"]
 
 [tool.coverage]
 run.source = [

src/pytest_echo/plugin.py

@@ -5,15 +5,24 @@
 import fnmatch
 import importlib.metadata as meta
 import os
+from dataclasses import dataclass
 from pprint import pformat
-from typing import Any
+from typing import Any, Iterator
 
 import pytest
 
 UNKNOWN_TYPE = "unknown type"
 UNKNOWN_ATTR = "unknown attribute"
 
 
+@dataclass
+class Entry:
+    """Configuration entries."""
+
+    key: str
+    type: str
+
+
 def get_installed_distributions() -> list[tuple[str, str]]:
     """Return a list of installed Distribution objects."""
     try:
@@ -26,7 +35,6 @@ def get_attr(obj: Any, attr: str, default: str | None = "NOT FOUND") -> Any:
     """Recursive get object's attribute. May use dot notation."""
     if "." not in attr:
         try:
-            ret = default
             if hasattr(obj, attr):
                 ret = getattr(obj, attr, default)
             elif isinstance(obj, (list, tuple)):
@@ -147,6 +155,25 @@ def pytest_report_header(config: pytest.Config) -> str | None:
 @pytest.hookimpl
 def pytest_addoption(parser: pytest.Parser) -> None:
     """Add section to configuration files."""
+    parser.addini(
+        "echo_envs",
+        type="linelist",
+        default=[],
+        help="environment to print",
+    )
+    parser.addini(
+        "echo_attributes",
+        type="linelist",
+        default=[],
+        help="attribute to print (full path)",
+    )
+    parser.addini(
+        "echo_versions",
+        type="linelist",
+        default=[],
+        help="package version to print",
+    )
+
     group = parser.getgroup("general")
     group.addoption(
         "--echo-env",
@@ -169,3 +196,30 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         default=[],
         help="attribute to print (full path)",
     )
+
+
+@pytest.hookimpl(tryfirst=True)
+def pytest_load_initial_conftests(
+    args: list[str],  # noqa: ARG001
+    early_config: pytest.Config,
+    parser: pytest.Parser,  # noqa: ARG001
+) -> None:
+    """Load environment variables from configuration files."""
+    for entry in _load_values(early_config):
+        if entry.type in {"env", "envs", "echo_envs"}:
+            early_config.option.echo_envs.append(entry.key)
+        if entry.type in ["attr", "attribute", "echo_attribute"]:
+            early_config.option.echo_attributes.append(entry.key)
+        if entry.type in ["version", "echo_version"]:
+            early_config.option.echo_versions.append(entry.key)
+
+
+def _load_values(early_config: pytest.Config) -> Iterator[Entry]:
+    has_toml_conf = False
+    if not has_toml_conf:
+        for var in early_config.getini("echo_envs"):
+            yield Entry(var, "env")
+        for var in early_config.getini("echo_attributes"):
+            yield Entry(var, "attr")
+        for var in early_config.getini("echo_versions"):
+            yield Entry(var, "version")

tests/test_config.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+import os
+from unittest import mock
+
+import pytest
+
+
+@pytest.mark.parametrize(
+    ("ini", "env"),
+    [
+        pytest.param(
+            "[pytest]\necho_envs = ENV1\n   ENV2\n   ENV3",
+            {"ENV1": "1", "ENV2": "2", "ENV3": "3"},
+            id="echo environment variables",
+        ),
+    ],
+)
+def test_ini_config(
+    testdir: pytest.Testdir,
+    ini: str,
+    env: dict[str, str],
+) -> None:
+    new_env = {
+        **env,
+        "PYTEST_DISABLE_PLUGIN_AUTOLOAD": "1",
+        "PYTEST_PLUGINS": "pytest_echo.plugin",
+    }
+    testdir.makeini(ini)
+
+    with mock.patch.dict(os.environ, new_env, clear=True):
+        result = testdir.runpytest(testdir)
+        result.stdout.fnmatch_lines(["    ENV1: 1"])
+
+
+@pytest.mark.parametrize(
+    ("toml", "env"),
+    [
+        pytest.param(
+            '[tool.pytest.ini_options]\necho_envs = ["ENV1", "ENV2", "ENV3"]',
+            {"ENV1": "1", "ENV2": "2", "ENV3": "3"},
+            id="echo environment variables",
+        ),
+    ],
+)
+def test_toml_config(
+    testdir: pytest.Testdir,
+    toml: str,
+    env: dict[str, str],
+) -> None:
+    new_env = {
+        **env,
+        "PYTEST_DISABLE_PLUGIN_AUTOLOAD": "1",
+        "PYTEST_PLUGINS": "pytest_echo.plugin",
+    }
+    with mock.patch.dict(os.environ, new_env, clear=True):
+        testdir.makepyfile("""def test_pass(request): pass""")
+        testdir.makepyprojecttoml(toml)
+        result = testdir.runpytest()
+        result.stdout.fnmatch_lines(["    ENV2: 2"])
+    result.assert_outcomes(passed=1)

tests/test_echo.py

@@ -7,8 +7,6 @@
 
 import pytest
 
-import pytest_echo
-
 ATTR_INT = 111
 ATTR_DICT = {"key": "value"}
 ATTR_LIST = [11, 12, 13, (21, 22)]
@@ -40,7 +38,7 @@ def test_echo_env_glob(testdir: pytest.Testdir) -> None:
 
 def test_echo_version(testdir: pytest.Testdir) -> None:
     result = testdir.runpytest("--echo-version=pytest-echo")
-    result.stdout.fnmatch_lines([f"*echo: {pytest_echo.__version__}"])
+    result.stdout.fnmatch_lines(["*echo: *"])
 
 
 def test_echo_version_error(testdir: pytest.Testdir) -> None:
@@ -63,14 +61,14 @@ def test_echo_version_non_standard(testdir: pytest.Testdir, module: str) -> None
 
 def test_echo_version_glob(testdir: pytest.Testdir) -> None:
     result = testdir.runpytest("--echo-version=pytest*")
-    result.stdout.fnmatch_lines([f"*echo-{pytest_echo.__version__}*"])
+    result.stdout.fnmatch_lines(["*echo-*"])
 
 
 def test_echo_all(testdir: pytest.Testdir) -> None:
     os.environ["PYTESTECHO"] = "123"
     result = testdir.runpytest("--echo-version=pytest_echo", "--echo-env=PYTESTECHO")
     result.stdout.fnmatch_lines(["    PYTESTECHO: 123"])
-    result.stdout.fnmatch_lines([f"    pytest_echo: {pytest_echo.__version__}"])
+    result.stdout.fnmatch_lines(["    pytest_echo: *"])
 
 
 def test_echo_attr(testdir: pytest.Testdir) -> None: