!squash test_git

Author: tony

tests/cmd/test_git.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from libvcs._vendor.version import Version
 from libvcs.cmd import git
 
 
@@ -28,7 +29,11 @@ def test_version_basic(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path)
     monkeypatch.setattr(git_cmd, "run", lambda *args, **kwargs: "git version 2.43.0")
 
     result = git_cmd.version()
-    assert result == "git version 2.43.0"
+    assert isinstance(result, Version)
+    assert result.major == 2
+    assert result.minor == 43
+    assert result.micro == 0
+    assert str(result) == "2.43.0"
 
 
 def test_version_with_build_options(
@@ -53,7 +58,11 @@ def mock_run(cmd_args: list[str], **kwargs: t.Any) -> str:
     monkeypatch.setattr(git_cmd, "run", mock_run)
 
     result = git_cmd.version(build_options=True)
-    assert result == sample_output
+    assert isinstance(result, Version)
+    assert result.major == 2
+    assert result.minor == 43
+    assert result.micro == 0
+    assert str(result) == "2.43.0"
 
 
 def test_build_options(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path) -> None:
@@ -67,9 +76,12 @@ def test_build_options(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path)
 sizeof-size_t: 8
 shell-path: /bin/sh"""
 
-    # We need to fix the parsing for "no commit associated with this build"
-    # in the build_options() method
-    monkeypatch.setattr(git_cmd, "version", lambda **kwargs: sample_output)
+    # Mock run() directly instead of version()
+    def mock_run(cmd_args: list[str], **kwargs: t.Any) -> str:
+        assert cmd_args == ["version", "--build-options"]
+        return sample_output
+
+    monkeypatch.setattr(git_cmd, "run", mock_run)
 
     result = git_cmd.build_options()
 
@@ -89,12 +101,54 @@ def test_build_options_invalid_version(
     """Test build_options() with invalid version string."""
     git_cmd = git.Git(path=tmp_path)
 
-    sample_output = "git version development"
+    sample_output = """git version development
+cpu: x86_64
+commit: abcdef123456
+sizeof-long: 8
+sizeof-size_t: 8
+shell-path: /bin/sh"""
+
+    def mock_run(cmd_args: list[str], **kwargs: t.Any) -> str:
+        assert cmd_args == ["version", "--build-options"]
+        return sample_output
 
-    monkeypatch.setattr(git_cmd, "version", lambda **kwargs: sample_output)
+    monkeypatch.setattr(git_cmd, "run", mock_run)
 
     result = git_cmd.build_options()
 
     assert isinstance(result, git.GitVersionInfo)
     assert result.version == "development"
     assert result.version_info is None
+    assert result.commit == "abcdef123456"
+
+
+def test_version_invalid_format(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path
+) -> None:
+    """Test version() with invalid output format."""
+    git_cmd = git.Git(path=tmp_path)
+
+    invalid_output = "not a git version format"
+
+    monkeypatch.setattr(git_cmd, "run", lambda *args, **kwargs: invalid_output)
+
+    with pytest.raises(git.InvalidVersion) as excinfo:
+        git_cmd.version()
+
+    assert "Unexpected git version output format" in str(excinfo.value)
+
+
+def test_build_options_invalid_format(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path
+) -> None:
+    """Test build_options() with invalid output format."""
+    git_cmd = git.Git(path=tmp_path)
+
+    invalid_output = "not a git version format"
+
+    monkeypatch.setattr(git_cmd, "run", lambda *args, **kwargs: invalid_output)
+
+    with pytest.raises(git.InvalidBuildOptions) as excinfo:
+        git_cmd.build_options()
+
+    assert "Unexpected git version output format" in str(excinfo.value)