refactor(test): Home dir, git config fixture, hgrc default fixes

tony · tony · commit 206e1fb35e3e · 2022-03-12T09:28:54.000-06:00
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
 import getpass
 import pathlib
+import shutil
 from typing import Dict
 
 import pytest
@@ -21,10 +22,15 @@ def user_path(home_path: pathlib.Path):
 
 
 @pytest.fixture(scope="function")
-def parentdir(tmp_path: pathlib.Path):
+def parentdir(user_path: pathlib.Path, request: pytest.FixtureRequest):
     """Return temporary directory for repository checkout guaranteed unique."""
-    dir = tmp_path / "repo"
-    dir.mkdir()
+    dir = user_path / "repos"
+    dir.mkdir(exist_ok=True)
+
+    def clean():
+        shutil.rmtree(dir)
+
+    request.addfinalizer(clean)
     return dir
 
 
diff --git a/tests/test_git.py b/tests/test_git.py
@@ -1,5 +1,6 @@
 """Tests for libvcs git repos."""
 import datetime
+import getpass
 import os
 import pathlib
 import textwrap
@@ -15,6 +16,27 @@
     pytestmark = pytest.mark.skip(reason="git is not available")
 
 
+@pytest.fixture(autouse=True, scope="module")
+def gitconfig(user_path: pathlib.Path):
+    gitconfig = user_path / ".gitconfig"
+    gitconfig.write_text(
+        textwrap.dedent(
+            f"""
+  [user]
+    email = libvcs@git-pull.com
+    name = {getpass.getuser()}
+    """
+        ),
+        encoding="utf-8",
+    )
+    return gitconfig
+
+
+@pytest.fixture(autouse=True)
+def gitconfig_default(monkeypatch: pytest.MonkeyPatch, user_path: pathlib.Path):
+    monkeypatch.setenv("HOME", str(user_path))
+
+
 def test_repo_git_obtain_initial_commit_repo(tmp_path: pathlib.Path):
     """initial commit repos return 'initial'.
 
diff --git a/tests/test_hg.py b/tests/test_hg.py
@@ -1,6 +1,5 @@
 """Tests for libvcs hg repos."""
 import getpass
-import os
 import pathlib
 import textwrap
 
@@ -14,33 +13,11 @@
 
 
 @pytest.fixture(autouse=True, scope="session")
-def home_path(tmp_path_factory: pytest.TempPathFactory):
-    return tmp_path_factory.mktemp("home")
-
-
-@pytest.fixture(autouse=True, scope="session")
-def user_path(home_path: pathlib.Path):
-    p = home_path / getpass.getuser()
-    p.mkdir()
-    return p
-
-
-@pytest.fixture(autouse=True, scope="session")
-def hg_user_path(user_path: pathlib.Path):
-    hg_config = user_path / ".hg"
-    hg_config.mkdir()
-    return hg_config
-
-
-@pytest.fixture(autouse=True, scope="session")
-def hgrc(hg_user_path: pathlib.Path):
-    hgrc = hg_user_path / "hgrc"
+def hgrc(user_path: pathlib.Path):
+    hgrc = user_path / ".hgrc"
     hgrc.write_text(
         textwrap.dedent(
             f"""
-        [paths]
-        default = {hg_remote}
-
         [ui]
         username = libvcs tests <libvcs@git-pull.com>
         merge = internal:merge
@@ -55,14 +32,14 @@ def hgrc(hg_user_path: pathlib.Path):
 
 
 @pytest.fixture(autouse=True)
-def hgrc_default(monkeypatch: pytest.MonkeyPatch, hgrc: pathlib.Path):
-    monkeypatch.chdir(hgrc.parent)
+def hgrc_default(monkeypatch: pytest.MonkeyPatch, user_path: pathlib.Path):
+    monkeypatch.setenv("HOME", str(user_path))
 
 
 @pytest.fixture
 def hg_remote(parentdir):
     """Create a git repo with 1 commit, used as a remote."""
-    name = "dummyrepo"
+    name = "test_hg_repo"
     repo_path = parentdir / name
 
     run(["hg", "init", name], cwd=parentdir)
@@ -95,4 +72,3 @@ def test_repo_mercurial(tmp_path: pathlib.Path, parentdir, hg_remote):
     )
 
     assert mercurial_repo.get_revision() == test_repo_revision
-    assert os.path.exists(tmp_path / repo_name)
