test: add cleanup for autobranches created in tests (#3506)

Author: Panaetius

renku/infrastructure/repository.py

@@ -1625,8 +1625,14 @@ def add(self, name: str) -> Branch:
         else:
             return Branch.from_head(repository=self._repository, head=head)
 
-    def remove(self, branch: Union[Branch, str], force: bool = False):
+    def remove(self, branch: Union[Branch, str], force: bool = False, remote: bool = False):
         """Remove an existing branch."""
+        if isinstance(branch, str):
+            branch = self[branch]
+
+        if remote and branch.remote_branch is not None:
+            _run_git_command(self._repository, branch.remote_branch.remote.name, branch, delete=True)
+
         _run_git_command(self._repository, "branch", branch, delete=True, force=force)
 
 

tests/core/fixtures/core_models.py

@@ -93,14 +93,27 @@ def git_repository_with_multiple_remotes(git_repository_with_remote):
 @pytest.fixture
 def protected_git_repository(tmp_path):
     """A Git repository with remote."""
+    from renku.core import errors
+
     parsed_url = urllib.parse.urlparse(IT_PROTECTED_REMOTE_REPO_URL)
 
     url = f"oauth2:{os.getenv('IT_OAUTH_GIT_TOKEN')}@{parsed_url.netloc}"
     parsed_url = parsed_url._replace(netloc=url).geturl()
 
     repository = Repository.clone_from(url=parsed_url, path=tmp_path)
 
+    branches_before = set(repository.branches)
+
     with repository.get_configuration(writable=True) as config:
         config.set_value("pull", "rebase", "false")
 
     yield repository
+
+    branches_after = set(repository.branches)
+
+    for branch in branches_after - branches_before:
+        # delete created branches
+        try:
+            repository.branches.remove(branch, force=True, remote=True)
+        except errors.GitCommandError:
+            continue