Addditional tests

Author: cidrblock

src/ansible_dev_environment/arg_parser.py

@@ -23,12 +23,12 @@
 
 
 ENVVAR_MAPPING: dict[str, str] = {
+    "ansi": "NO_COLOR",
     "isolation_mode": "ADE_ISOLATION_MODE",
     "seed": "ADE_SEED",
     "uv": "ADE_UV",
-    "verbose": "ADE_VERBOSE",
-    "ansi": "NO_COLOR",
     "venv": "VIRTUAL_ENV",
+    "verbose": "ADE_VERBOSE",
 }
 
 try:
@@ -305,9 +305,9 @@ def apply_envvars(args: list[str], parser: ArgumentParser) -> argparse.Namespace
             raise NotImplementedError(err)
 
         present = any(
-            o
-            for o in action.option_strings
-            if any(arg for arg in args if arg.startswith(o.split()[0]))
+            option
+            for option in action.option_strings
+            if any(arg for arg in args if arg.startswith(option.split()[0]))
         )
         envvar_value = os.environ.get(envvar)
 
@@ -321,14 +321,14 @@ def apply_envvars(args: list[str], parser: ArgumentParser) -> argparse.Namespace
             if envvar == "NO_COLOR" and envvar_value != "":
                 final_value = False
             elif isinstance(action, (argparse.BooleanOptionalAction, argparse._StoreTrueAction)):  # noqa: SLF001
-                final_value = str_to_bool(envvar_value)
                 named_type = "boolean"
+                final_value = str_to_bool(envvar_value)
             elif isinstance(action, argparse._CountAction) or action.type is int:  # noqa: SLF001
-                final_value = int(envvar_value)
                 named_type = "int"
+                final_value = int(envvar_value)
             elif action.type is str or action.type is None:
-                final_value = envvar_value
                 named_type = "str"
+                final_value = envvar_value
             else:
                 err = f"Action type {action.type} not implemented for envvar {envvar}"
                 raise NotImplementedError(err)

tests/unit/test_cli.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from ansible_dev_environment.arg_parser import ArgumentParser, apply_envvars
 from ansible_dev_environment.cli import Cli, main
 
 
@@ -300,3 +301,87 @@ def test_exit_code_two(
     assert excinfo.value.code == expected
     captured = capsys.readouterr()
     assert "Test warning" in captured.out
+
+
+def test_envvar_mapping_error(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Test environment mapping error.
+
+    Args:
+        monkeypatch: Pytest fixture.
+    """
+    monkeypatch.setattr(
+        "ansible_dev_environment.arg_parser.ENVVAR_MAPPING",
+        {"foo": "FOO"},
+    )
+    monkeypatch.setattr(
+        "sys.argv",
+        ["ansible-dev-environment", "install"],
+    )
+    cli = Cli()
+    with pytest.raises(NotImplementedError):
+        cli.parse_args()
+
+
+def test_apply_envvar_error(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Test environment mapping error.
+
+    Args:
+        monkeypatch: Pytest fixture.
+    """
+    monkeypatch.setattr(
+        "ansible_dev_environment.arg_parser.ENVVAR_MAPPING",
+        {"foo": "FOO"},
+    )
+    monkeypatch.setenv("FOO", "42.0")
+
+    parser = ArgumentParser()
+    parser.add_argument("--foo", type=float)
+
+    with pytest.raises(NotImplementedError) as excinfo:
+        apply_envvars(args=[], parser=parser)
+
+    assert "not implemented for envvar FOO" in str(excinfo.value)
+
+
+def test_env_wrong_type(
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    """Test wrong type.
+
+    Args:
+        monkeypatch: Pytest fixture.
+        capsys: Pytest stdout capture fixture.
+    """
+    monkeypatch.setattr(
+        "sys.argv",
+        ["ansible-dev-environment", "install"],
+    )
+    monkeypatch.setenv("ADE_VERBOSE", "not_an_int")
+    cli = Cli()
+    with pytest.raises(SystemExit):
+        cli.parse_args()
+    captured = capsys.readouterr()
+    assert "could not convert to int" in captured.err
+
+
+def test_env_wrong_choice(
+    monkeypatch: pytest.MonkeyPatch,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    """Test wrong choice.
+
+    Args:
+        monkeypatch: Pytest fixture.
+        capsys: Pytest stdout capture fixture.
+    """
+    monkeypatch.setattr(
+        "sys.argv",
+        ["ansible-dev-environment", "install"],
+    )
+    monkeypatch.setenv("ADE_ISOLATION_MODE", "wrong_choice")
+    cli = Cli()
+    with pytest.raises(SystemExit):
+        cli.parse_args()
+    captured = capsys.readouterr()
+    assert "choose from 'restrictive', 'cfg', 'none'" in captured.err

tests/unit/test_cli_deprecated.py

@@ -0,0 +1,46 @@
+"""Test some deprecated values in the CLI."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from ansible_dev_environment.cli import main
+
+
+if TYPE_CHECKING:
+    import pytest
+
+
+def test_adt(capsys: pytest.CaptureFixture[str], monkeypatch: pytest.MonkeyPatch) -> None:
+    """Test the seed option.
+
+    Args:
+        capsys: Pytest stdout capture fixture.
+        monkeypatch: Pytest fixture.
+    """
+    # Test the seed option
+    monkeypatch.setattr(
+        "sys.argv",
+        ["ansible-dev-environment", "install", "--adt"],
+    )
+    main(dry=True)
+    captured = capsys.readouterr()
+    assert "'--adt' is deprecated" in captured.out
+
+
+def test_skip_uv(capsys: pytest.CaptureFixture[str], monkeypatch: pytest.MonkeyPatch) -> None:
+    """Test the skip uv option.
+
+    Args:
+        capsys: Pytest stdout capture fixture.
+        monkeypatch: Pytest fixture.
+    """
+    # Test the skip uv option
+    monkeypatch.setattr(
+        "sys.argv",
+        ["ansible-dev-environment", "install"],
+    )
+    monkeypatch.setenv("SKIP_UV", "1")
+    main(dry=True)
+    captured = capsys.readouterr()
+    assert "'SKIP_UV' is deprecated" in captured.out

tests/unit/test_cli_precedence.py

@@ -0,0 +1,75 @@
+"""Test for cli and environment variable precedence."""
+
+from __future__ import annotations
+
+from typing import TypedDict
+
+import pytest
+
+from ansible_dev_environment.cli import Cli
+
+
+class Data(TypedDict):
+    """Test data dictionary.
+
+    Attributes:
+        attr: Attribute name.
+        args: Command line argument.
+        env: Environment variable name.
+        cli_expected: Expected value from command line argument.
+        env_expected: Expected value from environment variable.
+
+    """
+
+    attr: str
+    args: str
+    env: str
+    cli_expected: bool | int | str
+    env_expected: bool | int | str
+
+
+params: list[Data] = [
+    {
+        "attr": "ansi",
+        "args": "--ansi",
+        "env": "NO_COLOR",
+        "env_expected": False,
+        "cli_expected": True,
+    },
+    {
+        "attr": "seed",
+        "args": "--seed",
+        "env": "ADE_SEED",
+        "env_expected": False,
+        "cli_expected": True,
+    },
+    {"attr": "verbose", "args": "-vvv", "env": "ADE_VERBOSE", "env_expected": 2, "cli_expected": 3},
+    {"attr": "uv", "args": "--uv", "env": "ADE_UV", "env_expected": False, "cli_expected": True},
+]
+
+
+@pytest.mark.parametrize("data", params, ids=lambda d: d["attr"])
+def test_cli_precedence_flag(
+    data: Data,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test CLI precedence over environment variables.
+
+    Args:
+        data: Test data dictionary.
+        monkeypatch: Pytest fixture.
+
+    """
+    cli = Cli()
+
+    args = ["ade", "install"]
+    monkeypatch.setenv(data["env"], str(data["env_expected"]))
+    monkeypatch.setattr("sys.argv", args)
+
+    cli.parse_args()
+
+    assert getattr(cli.args, data["attr"]) == data["env_expected"]
+
+    args.append(data["args"])
+    cli.parse_args()
+    assert getattr(cli.args, data["attr"]) == data["cli_expected"]

tests/unit/test_utils.py

@@ -13,7 +13,7 @@
 )
 from ansible_dev_environment.config import Config
 from ansible_dev_environment.output import Output
-from ansible_dev_environment.utils import TermFeatures, builder_introspect
+from ansible_dev_environment.utils import TermFeatures, builder_introspect, str_to_bool
 
 
 term_features = TermFeatures(color=False, links=False)
@@ -174,3 +174,25 @@ def cache_dir(_self: Config) -> Path:
 
     assert cfg.discovered_bindep_reqs.exists() is True
     assert cfg.discovered_python_reqs.exists() is True
+
+
+def test_str_to_bool() -> None:
+    """Test the str_to_bool function.
+
+    This function tests the conversion of string values to boolean values.
+    """
+    assert str_to_bool("true") is True
+    assert str_to_bool("True") is True
+    assert str_to_bool("1") is True
+    assert str_to_bool("yes") is True
+    assert str_to_bool("y") is True
+    assert str_to_bool("on") is True
+
+    assert str_to_bool("false") is False
+    assert str_to_bool("False") is False
+    assert str_to_bool("0") is False
+    assert str_to_bool("no") is False
+    assert str_to_bool("n") is False
+    assert str_to_bool("off") is False
+
+    assert str_to_bool("anything else") is None