Review comments

Author: mikhainin

tests/vcs/git/git_fixture.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import shutil
 import typing
 
 
@@ -10,9 +9,6 @@
     import dulwich.repo
 
 
-GIT_NOT_INSTALLLED = shutil.which("git") is None
-
-
 class TempRepoFixture(typing.NamedTuple):
     path: Path
     repo: dulwich.repo.Repo

tests/vcs/git/test_backend.py

@@ -84,28 +84,26 @@ def test_urlpathjoin(url: str, expected_result: str) -> None:
     assert result == expected_result
 
 
-class TestBackendGit:
-    @pytest.mark.skip_git_mock
-    def test_clone_success(self, tmp_path: Path, temp_repo: TempRepoFixture) -> None:
-        source_root_dir = tmp_path / "test-repo"
-        Git.clone(
-            url=temp_repo.path.as_uri(), source_root=source_root_dir, name="clone-test"
-        )
-
-        target_dir = source_root_dir / "clone-test"
-        assert (target_dir / ".git").is_dir()
-
-    @pytest.mark.skip_git_mock
-    def test_short_sha_not_in_head(
-        self, tmp_path: Path, temp_repo: TempRepoFixture
-    ) -> None:
-        source_root_dir = tmp_path / "test-repo"
-        Git.clone(
-            url=temp_repo.path.as_uri(),
-            revision=temp_repo.middle_commit[:6],
-            name="clone-test",
-            source_root=source_root_dir,
-        )
-
-        target_dir = source_root_dir / "clone-test"
-        assert (target_dir / ".git").is_dir()
+@pytest.mark.skip_git_mock
+def test_clone_success(tmp_path: Path, temp_repo: TempRepoFixture) -> None:
+    source_root_dir = tmp_path / "test-repo"
+    Git.clone(
+        url=temp_repo.path.as_uri(), source_root=source_root_dir, name="clone-test"
+    )
+
+    target_dir = source_root_dir / "clone-test"
+    assert (target_dir / ".git").is_dir()
+
+
+@pytest.mark.skip_git_mock
+def test_short_sha_not_in_head(tmp_path: Path, temp_repo: TempRepoFixture) -> None:
+    source_root_dir = tmp_path / "test-repo"
+    Git.clone(
+        url=temp_repo.path.as_uri(),
+        revision=temp_repo.middle_commit[:6],
+        name="clone-test",
+        source_root=source_root_dir,
+    )
+
+    target_dir = source_root_dir / "clone-test"
+    assert (target_dir / ".git").is_dir()

tests/vcs/git/test_system.py

@@ -1,19 +1,22 @@
 from __future__ import annotations
 
 import re
+import shutil
 import subprocess
 import typing
 
 import pytest
 
 from poetry.vcs.git.system import SystemGit
-from tests.vcs.git.git_fixture import GIT_NOT_INSTALLLED
-from tests.vcs.git.git_fixture import TempRepoFixture
 
 
 if typing.TYPE_CHECKING:
     from pathlib import Path
 
+    from tests.vcs.git.git_fixture import TempRepoFixture
+
+GIT_NOT_INSTALLED = shutil.which("git") is None
+
 
 def get_head_sha(cwd: Path) -> str:
     return subprocess.check_output(
@@ -24,7 +27,7 @@ def get_head_sha(cwd: Path) -> str:
     ).strip()
 
 
-@pytest.mark.skipif(GIT_NOT_INSTALLLED, reason="These tests requires git cli")
+@pytest.mark.skipif(GIT_NOT_INSTALLED, reason="These tests requires git cli")
 class TestSystemGit:
     def test_clone_success(self, tmp_path: Path, temp_repo: TempRepoFixture) -> None:
         target_dir = tmp_path / "test-repo"