updates tests

Author: saxix

src/pytest_echo/plugin.py

@@ -27,7 +27,7 @@ def get_installed_distributions() -> list[tuple[str, str]]:
     """Return a list of installed Distribution objects."""
     try:
         return [(d.name, d.version) for d in meta.distributions()]
-    except (ImportError, AttributeError, TypeError):
+    except (ImportError, AttributeError, TypeError):  # pragma: no cover
         return []
 
 
@@ -142,10 +142,10 @@ def pytest_report_header(config: pytest.Config) -> str | None:
             data.extend(get_version(k))
         ret.append("\n".join([f"    {k}: {v}" for k, v in sorted(data)]))
 
-    if config.option.echo_attribues:
+    if config.option.echo_attributes:
         ret.extend([
             "Inspections:",
-            "\n".join([f"    {k}: {get_module_attribute(k)}" for k in config.option.echo_attribues]),
+            "\n".join([f"    {k}: {get_module_attribute(k)}" for k in config.option.echo_attributes]),
         ])
     if not ret:
         ret = ["pytest-echo: nothing to echoing"]
@@ -192,7 +192,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     group.addoption(
         "--echo-attr",
         action="append",
-        dest="echo_attribues",
+        dest="echo_attributes",
         default=[],
         help="attribute to print (full path)",
     )
@@ -208,18 +208,16 @@ def pytest_load_initial_conftests(
     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"}:
+        if entry.type in {"attr", "attribute", "echo_attributes"}:
             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")
+    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

@@ -34,11 +34,24 @@ def test_ini_config(
 
 
 @pytest.mark.parametrize(
-    ("toml", "env"),
+    ("toml", "env", "expected"),
     [
         pytest.param(
             '[tool.pytest.ini_options]\necho_envs = ["ENV1", "ENV2", "ENV3"]',
             {"ENV1": "1", "ENV2": "2", "ENV3": "3"},
+            "    ENV2: 2",
+            id="echo environment variables",
+        ),
+        pytest.param(
+            '[tool.pytest.ini_options]\necho_attributes = ["test_echo.ATTR_LIST"]',
+            {},
+            "    test_echo.ATTR_LIST: [11, 12, 13, (21, 22)]",
+            id="echo environment variables",
+        ),
+        pytest.param(
+            '[tool.pytest.ini_options]\necho_versions = ["pytest_echo"]',
+            {},
+            "    pytest_echo: *",
             id="echo environment variables",
         ),
     ],
@@ -47,6 +60,7 @@ def test_toml_config(
     testdir: pytest.Testdir,
     toml: str,
     env: dict[str, str],
+expected: str,
 ) -> None:
     new_env = {
         **env,
@@ -57,5 +71,5 @@ def test_toml_config(
         testdir.makepyfile("""def test_pass(request): pass""")
         testdir.makepyprojecttoml(toml)
         result = testdir.runpytest()
-        result.stdout.fnmatch_lines(["    ENV2: 2"])
+        result.stdout.fnmatch_lines([expected])
     result.assert_outcomes(passed=1)

tests/test_echo.py

@@ -11,7 +11,7 @@
 ATTR_DICT = {"key": "value"}
 ATTR_LIST = [11, 12, 13, (21, 22)]
 ATTR_COMPOSITE = {"key1": "value1", "key2": [11, 12, 13, 14], "key3": 99}
-
+ATTR_SET = {11, 12, 13, (21, 22)}
 
 class Dummy:
     attr = 1
@@ -91,15 +91,20 @@ def test_echo_attr_list(testdir: pytest.Testdir) -> None:
     result.stdout.fnmatch_lines(["    test_echo.ATTR_LIST.2: 13"])
 
 
+def test_echo_attr_set(testdir: pytest.Testdir) -> None:
+    result = testdir.runpytest("--echo-attr=test_echo.ATTR_SET.2")
+    result.stdout.fnmatch_lines(["    test_echo.ATTR_SET.2: (21, 22)"])
+
+
 def test_echo_attr_list_inner(testdir: pytest.Testdir) -> None:
     result = testdir.runpytest("--echo-attr=test_echo.ATTR_LIST.3.1")
     assert "    test_echo.ATTR_LIST.3.1: 22" in result.stdout.lines
 
 
 def test_echo_attr_list_composite(testdir: pytest.Testdir) -> None:
     result = testdir.runpytest(
-        "--echo-attr=test_echo.ATTR_COMPOSITE.key1",
-        "--echo-attr=test_echo.ATTR_COMPOSITE.key2.3",
+    "--echo-attr=test_echo.ATTR_COMPOSITE.key1",
+          "--echo-attr=test_echo.ATTR_COMPOSITE.key2.3",
     )
     assert "    test_echo.ATTR_COMPOSITE.key1: 'value1'" in result.stdout.lines
     assert "    test_echo.ATTR_COMPOSITE.key2.3: 14" in result.stdout.lines