Merge pull request #2900 from regro/debug-forks

fix: ensure github backend makes forks correctly
regro · Aug 2, 2024 · f2cefeb · f2cefeb
2 parents 2034547 + 5fc00d3
commit f2cefeb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/conda_forge_tick/git_utils.py b/conda_forge_tick/git_utils.py
@@ -532,9 +532,29 @@ def from_token(cls, token: str):
             github.Github(auth=github.Auth.Token(token), per_page=cls._GITHUB_PER_PAGE),
         )
 
+    def _get_repo(self, owner: str, repo_name: str) -> None | github3.repos.Repository:
+        repo = None
+        try:
+            repo = self.github3_client.repository(owner, repo_name)
+        except github3.exceptions.NotFoundError:
+            raise RepositoryNotFoundError(
+                f"Repository {owner}/{repo_name} does not exist."
+            )
+        except Exception as e:
+            logger.warning(
+                f"GitHub API error fetching repo {owner}/{repo_name}.",
+                exc_info=e,
+            )
+            raise e
+
+        return repo
+
     def does_repository_exist(self, owner: str, repo_name: str) -> bool:
-        repo = self.github3_client.repository(owner, repo_name)
-        return repo is not None
+        try:
+            self._get_repo(owner, repo_name)
+            return True
+        except RepositoryNotFoundError:
+            return False
 
     @lock_git_operation()
     def fork(self, owner: str, repo_name: str):
@@ -543,11 +563,7 @@ def fork(self, owner: str, repo_name: str):
             self._sync_default_branch(owner, repo_name)
             return
 
-        repo = self.github3_client.repository(owner, repo_name)
-        if repo is None:
-            raise RepositoryNotFoundError(
-                f"Repository {owner}/{repo_name} does not exist."
-            )
+        repo = self._get_repo(owner, repo_name)
 
         logger.debug(f"Forking {owner}/{repo_name}.")
         repo.create_fork()

diff --git a/tests/test_git_utils.py b/tests/test_git_utils.py
@@ -612,8 +612,15 @@ def test_github_backend_does_repository_exist(does_exist: bool):
     github3_client = MagicMock()
 
     backend = GitHubBackend(github3_client, MagicMock())
+    response = MagicMock()
+    response.status_code = 200 if does_exist else 404
 
-    github3_client.repository.return_value = MagicMock() if does_exist else None
+    if not does_exist:
+        github3_client.repository.side_effect = github3.exceptions.NotFoundError(
+            response
+        )
+    else:
+        github3_client.repository.return_value = MagicMock()
 
     assert backend.does_repository_exist("OWNER", "REPO") is does_exist
     github3_client.repository.assert_called_once_with("OWNER", "REPO")
@@ -702,7 +709,9 @@ def test_github_backend_remote_does_not_exist(
     exists_mock.return_value = False
 
     github3_client = MagicMock()
-    github3_client.repository.return_value = None
+    response = MagicMock()
+    response.status_code = 404
+    github3_client.repository.side_effect = github3.exceptions.NotFoundError(response)
 
     backend = GitHubBackend(github3_client, MagicMock())