TestProposedChangePipelineConflict setup uses a repository with a different name

Author: LucasG0

backend/tests/helpers/file_repo.py

@@ -15,6 +15,12 @@
 class FileRepo:
     name: str
     sources_directory: Path
+
+    # Some tests make a prior copy of fixtures/repos/car-dealership folder in a temp folder,
+    # in which case we need to use that temp folder instead of fixture dir. This could probably be removed
+    # when https://github.com/opsmill/infrahub/issues/4296 is fixed.
+    local_repo_base_path: Path = get_fixtures_dir() / "repos"
+
     _repo: Optional[Repo] = None
     _initial_branch: Optional[str] = None
     _branches: list[str] = field(default_factory=list)
@@ -48,7 +54,7 @@ def _apply_pull_requests(self, repo_base: Path) -> None:
             self.repo.git.commit("-m", pull_request)
 
     def __post_init__(self) -> None:
-        repo_base = Path(get_fixtures_dir(), "repos", self.name)
+        repo_base = Path(self.local_repo_base_path, self.name)
         initial_directory = self._initial_directory(repo_base=repo_base)
         shutil.copytree(repo_base / initial_directory, self.sources_directory / self.name)
         self._repo = Repo.init(self.sources_directory / self.name, initial_branch=self._initial_branch)

backend/tests/integration/proposed_change/test_proposed_change_conflict.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+import shutil
+import tempfile
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
@@ -10,21 +13,37 @@
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
 from infrahub.services.adapters.cache.redis import RedisCache
+from infrahub.utils import get_fixtures_dir
 from tests.constants import TestKind
 from tests.helpers.file_repo import FileRepo
 from tests.helpers.schema import CAR_SCHEMA, load_schema
 from tests.helpers.test_app import TestInfrahubApp
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from infrahub_sdk import InfrahubClient
 
     from infrahub.database import InfrahubDatabase
     from tests.adapters.message_bus import BusSimulator
 
 
 class TestProposedChangePipelineConflict(TestInfrahubApp):
+    @pytest.fixture(scope="class")
+    def car_dealership_copy(self):
+        """
+        Copies car-dealership local repository to a temporary folder, with a new name.
+        This is needed for this test as using car-dealership folder leads to issues most probably
+        related to https://github.com/opsmill/infrahub/issues/4296 as some other tests use this same repository.
+        """
+
+        source_folder = Path(get_fixtures_dir(), "repos", "car-dealership")
+        new_folder_name = "car-dealership-copy"
+
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+            destination_folder = temp_path / new_folder_name
+            shutil.copytree(source_folder, destination_folder)
+            yield temp_path, new_folder_name
+
     @pytest.fixture(scope="class")
     async def initial_dataset(
         self,
@@ -33,6 +52,7 @@ async def initial_dataset(
         git_repos_source_dir_module_scope: Path,
         client: InfrahubClient,
         bus_simulator: BusSimulator,
+        car_dealership_copy: tuple[Path, str],
     ) -> str:
         await load_schema(db, schema=CAR_SCHEMA)
         john = await Node.init(schema=TestKind.PERSON, db=db)
@@ -57,10 +77,11 @@ async def initial_dataset(
         await jesko.save(db=db)
 
         bus_simulator.service.cache = RedisCache()
-        FileRepo(name="car-dealership", sources_directory=git_repos_source_dir_module_scope)
+        repo_path, repo_name = car_dealership_copy
+        FileRepo(name=repo_name, local_repo_base_path=repo_path, sources_directory=git_repos_source_dir_module_scope)
         client_repository = await client.create(
             kind=InfrahubKind.REPOSITORY,
-            data={"name": "car-dealership", "location": f"{git_repos_source_dir_module_scope}/car-dealership"},
+            data={"name": "dealership-car", "location": f"{git_repos_source_dir_module_scope}/{repo_name}"},
         )
         await client_repository.save()
         return client_repository.id