Use a distinct keep alive file for each test function

Author: bbugyi200

tests/common.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Any, Final, Protocol
 
 
@@ -17,8 +16,6 @@
 YEST_DD: Final = "02"
 TODAY: Final = f"{YYYY}-{MM}-{DD}"
 
-keep_alive_file_path = Path("/tmp/zorg_test_keep_alive")
-
 
 class MainType(Protocol):
     """Type returned by main() fixture."""

tests/conftest.py

@@ -6,7 +6,6 @@
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING, Any, Iterator
 
 from freezegun import freeze_time
@@ -25,15 +24,10 @@
 
 
 @fixture
-def main(make_config_file: MakeConfigFile, tmp_path: Path) -> c.MainType:
+def main(make_config_file: MakeConfigFile) -> c.MainType:
     """Returns a wrapper around zorg's main() function."""
 
-    default_zettel_dir = tmp_path / "org"
-
     def inner_main(*args: str, **kwargs: Any) -> int:
-        kwargs.setdefault("zettel_dir", default_zettel_dir)
-        kwargs.setdefault("keep_alive_file", c.keep_alive_file_path)
-
         cfg_kwargs = {
             k: v if isinstance(v, dict) else str(v)
             for (k, v) in kwargs.items()

tests/test_edit_cmd.py

@@ -70,8 +70,15 @@ def test_whenEmptyKeepAliveFileExists_shouldRestartVim(
     """Test that we can use the keep alive file to have zorg re-run vim."""
     zettel_dir = tmp_path / "org"
 
-    c.keep_alive_file_path.touch()
-    exit_code = main("--dir", str(zettel_dir), "edit", "foobar.zo")
+    keep_alive_file = tmp_path / "zorg_keep_alive"
+    keep_alive_file.touch()
+    exit_code = main(
+        "--dir",
+        str(zettel_dir),
+        "edit",
+        "foobar.zo",
+        keep_alive_file=keep_alive_file,
+    )
 
     assert exit_code == 0
     vim_proc_mock.assert_called_with(
@@ -81,7 +88,7 @@ def test_whenEmptyKeepAliveFileExists_shouldRestartVim(
         timeout=None,
     )
     assert vim_proc_mock.call_count == 2
-    assert not c.keep_alive_file_path.exists()
+    assert not keep_alive_file.exists()
 
 
 def test_whenKeepAliveFileContainsPaths_useThosePathsOnRestart(
@@ -90,8 +97,15 @@ def test_whenKeepAliveFileContainsPaths_useThosePathsOnRestart(
     """Test that we can use the keep alive file to change our vim file args."""
     zettel_dir = tmp_path / "org"
 
-    c.keep_alive_file_path.write_text("baz.zo buz.zo")
-    exit_code = main("--dir", str(zettel_dir), "edit", "foobar.zo")
+    keep_alive_file = tmp_path / "zorg_keep_alive"
+    keep_alive_file.write_text("baz.zo buz.zo")
+    exit_code = main(
+        "--dir",
+        str(zettel_dir),
+        "edit",
+        "foobar.zo",
+        keep_alive_file=keep_alive_file,
+    )
 
     assert exit_code == 0
     vim_proc_mock.assert_has_calls([
@@ -111,4 +125,4 @@ def test_whenKeepAliveFileContainsPaths_useThosePathsOnRestart(
         call().unwrap(),
     ])
     assert vim_proc_mock.call_count == 2
-    assert not c.keep_alive_file_path.exists()
+    assert not keep_alive_file.exists()