Add integration test for dulwich

Author: minitriga

infrahub_sdk/repository.py

@@ -22,18 +22,11 @@ def initialize_repo(self) -> Repo:
         else:
             repo = Repo.init(self.root_directory, default_branch=self.branch.encode("utf-8"))
 
-            self.create_initial_commit()
-
         if not repo:
             raise ValueError("Failed to initialize or open a repository.")
 
         return repo
 
-    def create_initial_commit(self) -> None:
-        committer = b"Initial Commit <[email protected]>"
-        commit_msg = b"Initial commit"
-        porcelain.commit(self.root_directory, message=commit_msg, author=committer)
-
     @property
     def active_branch(self) -> str | None:
         active_branch = porcelain.active_branch(self.root_directory).decode("utf-8")

infrahub_sdk/testing/repository.py

@@ -7,6 +7,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from dulwich import porcelain
+
 from infrahub_sdk.graphql import Mutation
 from infrahub_sdk.protocols import CoreGenericRepository
 from infrahub_sdk.repository import GitRepoManager
@@ -64,6 +66,15 @@ def init(self) -> None:
 
         self._repo = GitRepoManager(str(Path(self.dst_directory / self.name)), branch=self.initial_branch)
 
+        files = list(
+            porcelain.get_untracked_paths(self._repo.git.path, self._repo.git.path, self._repo.git.open_index())
+        )
+        files_to_add = [str(Path(self._repo.git.path) / t) for t in files]
+        if files_to_add:
+            porcelain.add(repo=self._repo.git.path, paths=files_to_add)
+            porcelain.commit(repo=self._repo.git.path, message="First commit")
+            porcelain.checkout_branch(self._repo.git, self.initial_branch.encode("utf-8"))
+
     async def add_to_infrahub(self, client: InfrahubClient, branch: str | None = None) -> dict:
         input_data = {
             "data": {

tests/fixtures/integration/repo/blank_schema.yml

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from infrahub_sdk.testing.docker import TestInfrahubDockerClient
+from infrahub_sdk.testing.repository import GitRepo
+from infrahub_sdk.utils import get_fixtures_dir
+
+if TYPE_CHECKING:
+    from infrahub_sdk import InfrahubClient
+
+
+class TestInfrahubRepository(TestInfrahubDockerClient):
+    @pytest.fixture(scope="class")
+    def infrahub_version(self) -> str:
+        return "1.1.0"
+
+    async def test_add_repository(self, client: InfrahubClient, remote_repos_dir):
+        src_directory = get_fixtures_dir() / "integration/repo"
+        repo = GitRepo(name="test", src_directory=src_directory, dst_directory=remote_repos_dir)
+        commit = repo._repo.git[repo._repo.git.head()]
+        response = await repo.add_to_infrahub(client=client)
+        repos = await client.all(kind=repo.type)
+
+        assert len(list(repo._repo.git.get_walker())) == 1
+        assert commit.message.decode("utf-8") == "First commit"
+        assert response.get(f"{repo.type.value}Create", {}).get("ok")
+        assert len(repos) == 1

tests/integration/test_repository.py

@@ -5,6 +5,8 @@
 from dulwich.repo import Repo
 
 from infrahub_sdk.repository import GitRepoManager
+from infrahub_sdk.testing.repository import GitRepo
+from infrahub_sdk.utils import get_fixtures_dir
 
 
 @pytest.fixture
@@ -29,21 +31,12 @@ def test_initialize_repo_creates_new_repo(temp_dir):
 def test_initialize_repo_uses_existing_repo(temp_dir):
     """Test that the GitRepoManager uses an existing repository without an active branch."""
     # Manually initialize a repo
-    Repo.init(temp_dir)
+    Repo.init(temp_dir, default_branch=b"main")
 
-    with pytest.raises(ValueError, match="Git repository does not have an active branch."):
-        manager = GitRepoManager(temp_dir)
-        assert manager.git is not None
-        assert isinstance(manager.git, Repo)
-        assert (Path(temp_dir) / ".git").is_dir()
-
-
-def test_create_initial_commit(temp_dir):
-    """Test that an initial commit is created."""
     manager = GitRepoManager(temp_dir)
-
-    # Verify there is at least one commit
-    assert len(list(manager.git.get_walker())) == 1
+    assert manager.git is not None
+    assert isinstance(manager.git, Repo)
+    assert (Path(temp_dir) / ".git").is_dir()
 
 
 def test_active_branch_returns_correct_branch(temp_dir):
@@ -62,16 +55,13 @@ def mock_init(*args, **kwargs):  # noqa: ANN002, ANN003
 
     monkeypatch.setattr(Repo, "init", mock_init)
 
-    with pytest.raises(ValueError, match="Git repository not initialized."):
+    with pytest.raises(ValueError, match="Failed to initialize or open a repository."):
         GitRepoManager(temp_dir)
 
 
-def test_active_branch_raises_error_if_repo_not_initialized(temp_dir):
-    """Test that accessing the active branch raises an error if the repo is not initialized."""
-    manager = GitRepoManager(temp_dir)
-
-    # Manually unset the repository to simulate uninitialized state
-    manager.git = None
-
-    with pytest.raises(ValueError, match="Repository is not initialized."):
-        _ = manager.active_branch
+def test_gitrepo_init(temp_dir):
+    src_directory = get_fixtures_dir() / "integration/repo"
+    repo = GitRepo(name="test", src_directory=src_directory, dst_directory=Path(temp_dir))
+    assert len(list(repo._repo.git.get_walker())) == 1
+    commit = repo._repo.git[repo._repo.git.head()]
+    assert commit.message.decode("utf-8") == "First commit"