add branch test

LucasG0 · LucasG0 · commit 87bda9ffc6ee · 2025-05-26T13:25:58.000+02:00
diff --git a/backend/infrahub/git/integrator.py b/backend/infrahub/git/integrator.py
@@ -218,14 +218,9 @@ async def import_objects_from_files(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]
 
-                # TODO: import menu, check def load() in menu.^y + add a deidcated group for menu, work as for objects
-                # "CoreRepositoryMenuGroup"
-
         except Exception as exc:
             sync_status = RepositorySyncStatus.ERROR_IMPORT
             error = exc
-            log = get_run_logger()
-            log.error(f"Error importing the repository {self.name} : {exc}")
 
         await self._update_sync_status(branch_name=infrahub_branch_name, status=sync_status)
 
@@ -858,7 +853,6 @@ async def _load_objects(
 
         log = get_run_logger()
         files = await self._load_yamlfile_from_disk(paths=paths, file_type=file_type)
-        log.info(f"Loaded files {files=}")
 
         for file in files:
             await file.validate_format(client=self.get_client(), branch=branch)
@@ -870,23 +864,16 @@ async def _load_objects(
                 )
 
         for file in files:
-            # TODO: client.log that is then used should log into infrahub.tasks
             log.info(f"Loading objects defined in {file.location}")
             await file.process(client=self.get_client(), branch=branch)
 
     @task(name="import-objects", task_run_name="Import Objects", cache_policy=NONE)  # type: ignore[arg-type]
     async def import_objects(
         self, branch_name: str, commit: str, files_pathes: list[Path], object_type: RepositoryObjects
     ) -> None:
-        log = get_run_logger()
-        log.info(f"Importing {object_type.value} from {files_pathes=}")
-
         branch_wt = self.get_worktree(identifier=commit or branch_name)
-
         file_pathes = [branch_wt.directory / file_path for file_path in files_pathes]
 
-        log.info("Before getting the repository object")
-        # do not clone for now, assume only one import at a time
         if self.is_read_only:
             sdk_repo_obj = await self.get_client().get(
                 kind=InfrahubKind.READONLYREPOSITORY, id=str(self.id), raise_when_missing=True
@@ -896,15 +883,14 @@ async def import_objects(
                 kind=InfrahubKind.REPOSITORY, id=str(self.id), raise_when_missing=True
             )
 
-        log.info(f"After getting the repository object {sdk_repo_obj.id}")
-
+        # We currently assume there can't be concurrent imports, but if so, we might need to clone the client before tracking here.
         async with self.get_client().start_tracking(
             identifier=f"group-repo-{object_type.value}-{self.id}",
             delete_unused_nodes=True,
+            branch=branch_name,
             group_type="CoreRepositoryGroup",
             group_params={"content": object_type.value, "repository": sdk_repo_obj},
         ):
-            log.info("Started to track")
             file_type = ObjectFile if object_type == RepositoryObjects.OBJECT else MenuFile
             await self._load_objects(
                 paths=file_pathes,
diff --git a/backend/tests/integration/git/test_repository.py b/backend/tests/integration/git/test_repository.py
@@ -6,7 +6,7 @@
 import pytest
 from git import GitCommandError
 
-from infrahub.core.constants import InfrahubKind, RepositoryObjects, RepositoryOperationalStatus
+from infrahub.core.constants import InfrahubKind, RepositoryOperationalStatus
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
 from infrahub.exceptions import RepositoryError
@@ -15,6 +15,7 @@
 from tests.helpers.file_repo import FileRepo
 from tests.helpers.schema import CAR_SCHEMA, load_schema
 from tests.helpers.test_app import TestInfrahubApp
+from tests.integration.git.utils import check_repo_correctly_created
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -50,6 +51,7 @@ async def test_create_repository(
         initial_dataset: None,
         git_repos_source_dir_module_scope: Path,
         client: InfrahubClient,
+        default_branch,
     ) -> None:
         """Validate that we can create a repository, that it gets updated with the commit id and that objects are created."""
         client_repository = await client.create(
@@ -59,66 +61,23 @@ async def test_create_repository(
         await client_repository.save()
 
         repository: CoreRepository = await NodeManager.get_one(
-            db=db, id=client_repository.id, kind=InfrahubKind.REPOSITORY, raise_on_error=True
-        )
-
-        check_definition: CoreCheckDefinition = await NodeManager.get_one_by_default_filter(
-            db=db, id="car_description_check", kind=InfrahubKind.CHECKDEFINITION, raise_on_error=True
-        )
-
-        assert repository.commit.value
-        assert repository.internal_status.value == "active"
-        assert repository.operational_status.value == "online"
-        assert check_definition.file_path.value == "checks/car_overview.py"
-
-        person_ethan = await NodeManager.get_one_by_default_filter(
-            db=db, id="Ethan Carter", kind="TestingPerson", raise_on_error=True
-        )
-        assert person_ethan.name.value == "Ethan Carter"
-        assert person_ethan.height.value == 180
-
-        manufacturer_mercedes = await NodeManager.get_one_by_default_filter(
-            db=db, id="Mercedes", kind="TestingManufacturer", raise_on_error=True, prefetch_relationships=True
-        )
-        assert manufacturer_mercedes.name.value == "Mercedes"
-        assert list((await manufacturer_mercedes.customers.get_peers(db=db)).values())[0].name.value == "Ethan Carter"
-
-        repository_group = await NodeManager.get_one_by_default_filter(
             db=db,
-            id=f"group-repo-{RepositoryObjects.OBJECT.value}-{repository.id}",
-            kind="CoreRepositoryGroup",
-            raise_on_error=True,
-            prefetch_relationships=True,
-        )
-        assert repository_group.content.value == RepositoryObjects.OBJECT.value
-        members = (await repository_group.members.get_peers(db=db)).values()
-        assert len(members) == 4
-        assert manufacturer_mercedes.id in {m.id for m in members}
-        assert person_ethan.id in {m.id for m in members}
-
-        # TODO Retrieve menus
-
-        repository_group_menus = await NodeManager.get_one_by_default_filter(
-            db=db,
-            id=f"group-repo-{RepositoryObjects.MENU.value}-{repository.id}",
-            kind="CoreRepositoryGroup",
+            id=client_repository.id,
+            kind=InfrahubKind.REPOSITORY,
             raise_on_error=True,
-            prefetch_relationships=True,
         )
-
-        assert repository_group_menus.content.value == RepositoryObjects.MENU.value
-
-        _ = await NodeManager.get_one_by_hfid(
+        check_definition: CoreCheckDefinition = await NodeManager.get_one_by_default_filter(
             db=db,
-            hfid=["Testing", "Manufacturer"],
-            kind="CoreMenu",
+            id="car_description_check",
+            kind=InfrahubKind.CHECKDEFINITION,
             raise_on_error=True,
-            prefetch_relationships=True,
         )
+        assert repository.commit.value
+        assert repository.internal_status.value == "active", f"{repository.internal_status.value=}"
+        assert repository.operational_status.value == "online"
+        assert check_definition.file_path.value == "checks/car_overview.py"
 
-        _ = await NodeManager.get_one_by_hfid(
-            db=db, hfid=["Testing", "Person"], kind="CoreMenu", raise_on_error=True, prefetch_relationships=True
-        )
+        await check_repo_correctly_created(repo_id=client_repository.id, db=db, branch_name=default_branch.name)
 
     # TODO add a test with invalid yml file OR invalid order of objects in the yml file, and make sure the repository ends
     # up in error import state
diff --git a/backend/tests/integration/git/test_repository_branch.py b/backend/tests/integration/git/test_repository_branch.py
@@ -11,13 +11,14 @@
 from tests.helpers.file_repo import FileRepo
 from tests.helpers.schema import CAR_SCHEMA, load_schema
 from tests.helpers.test_app import TestInfrahubApp
+from tests.integration.git.utils import check_repo_correctly_created
 
 if TYPE_CHECKING:
     from pathlib import Path
 
     from infrahub_sdk import InfrahubClient
 
-    from infrahub.core.protocols import CoreCheckDefinition, CoreRepository
+    from infrahub.core.protocols import CoreRepository
     from infrahub.database import InfrahubDatabase
 
 BRANCH_NAME = "branch2"
@@ -48,38 +49,17 @@ async def test_create_repository(
         git_repos_source_dir_module_scope: Path,
         client: InfrahubClient,
     ) -> None:
+        """Validate that we can create a repository, that it gets updated with the commit id and that objects are created."""
+
         branch = await client.branch.create(branch_name=BRANCH_NAME)
 
-        """Validate that we can create a repository, that it gets updated with the commit id and that objects are created."""
         client_repository = await client.create(
             kind=InfrahubKind.REPOSITORY,
             branch=branch.name,
             data={"name": "car-dealership", "location": f"{git_repos_source_dir_module_scope}/car-dealership"},
         )
         await client_repository.save()
-
-        repository_branch: CoreRepository = await NodeManager.get_one(
-            db=db, id=client_repository.id, kind=InfrahubKind.REPOSITORY, branch=branch.name, raise_on_error=True
-        )
-
-        check_definition: CoreCheckDefinition = await NodeManager.get_one_by_default_filter(
-            db=db,
-            id="car_description_check",
-            kind=InfrahubKind.CHECKDEFINITION,
-            branch=branch.name,
-            raise_on_error=True,
-        )
-
-        assert repository_branch.commit.value
-        assert repository_branch.internal_status.value == RepositoryInternalStatus.STAGING.value
-        assert check_definition.file_path.value == "checks/car_overview.py"
-
-        repository_main: CoreRepository = await NodeManager.get_one(
-            db=db, id=client_repository.id, kind=InfrahubKind.REPOSITORY, raise_on_error=True
-        )
-
-        assert repository_main.commit.value is None
-        assert repository_main.internal_status.value == RepositoryInternalStatus.INACTIVE.value
+        await check_repo_correctly_created(client_repository, db, branch_name=branch.name)
 
     async def test_merge_branch(
         self,
diff --git a/backend/tests/integration/git/utils.py b/backend/tests/integration/git/utils.py
@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+from infrahub.core.constants import RepositoryObjects
+from infrahub.core.manager import NodeManager
+
+
+async def check_repo_correctly_created(repo_id, db, branch_name: str):
+    person_ethan = await NodeManager.get_one_by_default_filter(
+        db=db, id="Ethan Carter", kind="TestingPerson", raise_on_error=True, branch=branch_name
+    )
+    assert person_ethan.name.value == "Ethan Carter"
+    assert person_ethan.height.value == 180
+    manufacturer_mercedes = await NodeManager.get_one_by_default_filter(
+        db=db,
+        id="Mercedes",
+        kind="TestingManufacturer",
+        raise_on_error=True,
+        prefetch_relationships=True,
+        branch=branch_name,
+    )
+    assert manufacturer_mercedes.name.value == "Mercedes"
+    assert list((await manufacturer_mercedes.customers.get_peers(db=db)).values())[0].name.value == "Ethan Carter"
+    repository_group = await NodeManager.get_one_by_default_filter(
+        db=db,
+        id=f"group-repo-{RepositoryObjects.OBJECT.value}-{repo_id}",
+        kind="CoreRepositoryGroup",
+        raise_on_error=True,
+        prefetch_relationships=True,
+        branch=branch_name,
+    )
+    assert repository_group.content.value == RepositoryObjects.OBJECT.value
+    members = (await repository_group.members.get_peers(db=db)).values()
+    assert len(members) == 4
+    assert manufacturer_mercedes.id in {m.id for m in members}
+    assert person_ethan.id in {m.id for m in members}
+
+    repository_group_menus = await NodeManager.get_one_by_default_filter(
+        db=db,
+        id=f"group-repo-{RepositoryObjects.MENU.value}-{repo_id}",
+        kind="CoreRepositoryGroup",
+        raise_on_error=True,
+        prefetch_relationships=True,
+        branch=branch_name,
+    )
+    assert repository_group_menus.content.value == RepositoryObjects.MENU.value
+    _ = await NodeManager.get_one_by_hfid(
+        db=db,
+        hfid=["Testing", "Manufacturer"],
+        kind="CoreMenu",
+        raise_on_error=True,
+        prefetch_relationships=True,
+        branch=branch_name,
+    )
+    _ = await NodeManager.get_one_by_hfid(
+        db=db,
+        hfid=["Testing", "Person"],
+        kind="CoreMenu",
+        raise_on_error=True,
+        prefetch_relationships=True,
+        branch=branch_name,
+    )
diff --git a/python_sdk b/python_sdk
@@ -1 +1 @@
-Subproject commit 785487df61766c3005a31140df4ca81f9cd2641f
+Subproject commit 0f8b7c093d8f694a3c9c372c7088171e62988f79
