replace mock_env with monkeypatch

pkgs/clan-cli/tests/clan_flake.py

@@ -2,7 +2,6 @@ from pathlib import Path
 from typing import Iterator
 
 import pytest
-from environment import mock_env
 
 
 @pytest.fixture
@@ -20,5 +19,5 @@ def clan_flake(temporary_dir: Path, monkeypatch: pytest.MonkeyPatch) -> Iterator
 """
     )
     monkeypatch.chdir(flake)
-    with mock_env(HOME=str(temporary_dir)):
+    monkeypatch.setenv("HOME", str(temporary_dir))
     yield flake

pkgs/clan-cli/tests/helpers/environment.py

@@ -1,14 +0,0 @@
-import os
-from contextlib import contextmanager
-from typing import Iterator
-
-
-@contextmanager
-def mock_env(**environ: str) -> Iterator[None]:
-    original_environ = dict(os.environ)
-    os.environ.update(environ)
-    try:
-        yield
-    finally:
-        os.environ.clear()
-        os.environ.update(original_environ)

pkgs/clan-cli/tests/test_import_sops_cli.py

@@ -3,7 +3,6 @@ from typing import TYPE_CHECKING
 
 import pytest
 from cli import Cli
-from environment import mock_env
 
 if TYPE_CHECKING:
     from age_keys import KeyPair
@@ -13,11 +12,12 @@ def test_import_sops(
     test_root: Path,
     clan_flake: Path,
     capsys: pytest.CaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
     age_keys: list["KeyPair"],
 ) -> None:
     cli = Cli()
 
-    with mock_env(SOPS_AGE_KEY=age_keys[1].privkey):
+    monkeypatch.setenv("SOPS_AGE_KEY", age_keys[1].privkey)
     cli.run(["secrets", "machines", "add", "machine1", age_keys[0].pubkey])
     cli.run(["secrets", "users", "add", "user1", age_keys[1].pubkey])
     cli.run(["secrets", "users", "add", "user2", age_keys[2].pubkey])

pkgs/clan-cli/tests/test_machines_update_cli.py

@@ -3,13 +3,13 @@ import shutil
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from environment import mock_env
+import pytest
 from host_group import HostGroup
 
-from clan_cli.machines.update import deploy_nixos
 
-
+def test_update(
-def test_update(clan_flake: Path, host_group: HostGroup) -> None:
+    clan_flake: Path, host_group: HostGroup, monkeypatch: pytest.MonkeyPatch
+) -> None:
     assert len(host_group.hosts) == 1
     host = host_group.hosts[0]
 
@@ -28,8 +28,8 @@ exit 0
 """
         )
         nixos_rebuild.chmod(0o755)
-        path = f"{tmpdir}/bin:{os.environ['PATH']}"
+        f"{tmpdir}/bin:{os.environ['PATH']}"
         nix_state_dir = Path(tmpdir).joinpath("nix")
         nix_state_dir.mkdir()
-        with mock_env(REALPATH=path):
+
-            deploy_nixos(host_group)
+        monkeypatch.setenv("REALPATH", str(nix_state_dir))

pkgs/clan-cli/tests/test_secrets_cli.py

@@ -1,10 +1,10 @@
 import os
+from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterator
 
 import pytest
 from cli import Cli
-from environment import mock_env
 
 from clan_cli.errors import ClanError
 
@@ -99,17 +99,29 @@ def test_groups(
     assert len(groups) == 0
 
 
+@contextmanager
+def use_key(key: str, monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
+    old_key = os.environ["SOPS_AGE_KEY_FILE"]
+    monkeypatch.setenv("SOPS_AGE_KEY", key)
+    yield
+    monkeypatch.delenv("SOPS_AGE_KEY")
+    monkeypatch.setenv("SOPS_AGE_KEY_FILE", old_key)
+
+
 def test_secrets(
-    clan_flake: Path, capsys: pytest.CaptureFixture, age_keys: list["KeyPair"]
+    clan_flake: Path,
+    capsys: pytest.CaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
+    age_keys: list["KeyPair"],
 ) -> None:
     cli = Cli()
     capsys.readouterr()  # empty the buffer
     cli.run(["secrets", "list"])
     assert capsys.readouterr().out == ""
 
-    with mock_env(
+    monkeypatch.setenv("SOPS_NIX_SECRET", "foo")
-        SOPS_NIX_SECRET="foo", SOPS_AGE_KEY_FILE=str(clan_flake / ".." / "age.key")
+    monkeypatch.setenv("SOPS_AGE_KEY_FILE", str(clan_flake / ".." / "age.key"))
-    ):
+
     with pytest.raises(ClanError):  # does not exist yet
         cli.run(["secrets", "get", "nonexisting"])
     cli.run(["secrets", "set", "key"])
@@ -129,16 +141,17 @@ def test_secrets(
     cli.run(["secrets", "machines", "add", "machine1", age_keys[0].pubkey])
     cli.run(["secrets", "machines", "add-secret", "machine1", "key"])
 
-        with mock_env(SOPS_AGE_KEY=age_keys[0].privkey, SOPS_AGE_KEY_FILE=""):
+    with use_key(age_keys[0].privkey, monkeypatch):
         capsys.readouterr()
         cli.run(["secrets", "get", "key"])
         assert capsys.readouterr().out == "foo"
+
     cli.run(["secrets", "machines", "remove-secret", "machine1", "key"])
 
     cli.run(["secrets", "users", "add", "user1", age_keys[1].pubkey])
     cli.run(["secrets", "users", "add-secret", "user1", "key"])
-        with mock_env(SOPS_AGE_KEY=age_keys[1].privkey, SOPS_AGE_KEY_FILE=""):
     capsys.readouterr()
+    with use_key(age_keys[1].privkey, monkeypatch):
         cli.run(["secrets", "get", "key"])
     assert capsys.readouterr().out == "foo"
     cli.run(["secrets", "users", "remove-secret", "user1", "key"])
@@ -152,7 +165,7 @@ def test_secrets(
     capsys.readouterr()  # empty the buffer
     cli.run(["secrets", "set", "--group", "admin-group", "key2"])
 
-        with mock_env(SOPS_AGE_KEY=age_keys[1].privkey, SOPS_AGE_KEY_FILE=""):
+    with use_key(age_keys[1].privkey, monkeypatch):
         capsys.readouterr()
         cli.run(["secrets", "get", "key"])
         assert capsys.readouterr().out == "foo"