Fetch repo content from target branch (#47)

* Fetch repo content from target branch The source branch of the PR may not exist at that point in time when you try to request content from it. Signed-off-by: Jean Remond <[email protected]> * Fixed test Signed-off-by: Corey Caverly <[email protected]> --------- Signed-off-by: Jean Remond <[email protected]> Signed-off-by: Corey Caverly <[email protected]> Co-authored-by: Corey Caverly <[email protected]>
argoproj-labs · Oct 5, 2023 · 0265753 · 0265753
1 parent e8dd5ad
commit 0265753
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gordian/repo.py b/gordian/repo.py
@@ -130,7 +130,7 @@ def _set_target_branch(self, target_branch, source_branch=None):
     def _get_repo_contents(self, path):
         try:
             logger.debug(f'Fetching repo contents {path}...')
-            return self._source_repo.get_contents(path, self.source_branch)
+            return self._source_repo.get_contents(path, self.target_branch)
         except GithubException as e:
             if e.status == 404:
                 raise e

diff --git a/tests/test_repo.py b/tests/test_repo.py
@@ -84,7 +84,7 @@ def test_get_files(self):
         repository_file = MagicMock(path='afile.txt', type='not_dir')
         self.repo._source_repo.get_contents.side_effect = [[MagicMock(path='directory', type='dir')],[repository_file]]
         self.repo.get_files()
-        self.repo._source_repo.get_contents.assert_has_calls([call('', 'refs/heads/target'), call('directory', 'refs/heads/target')])
+        self.repo._source_repo.get_contents.assert_has_calls([call('', 'target'), call('directory', 'target')])
         self.assertEquals(self.repo.files, [repository_file])
 
     def test_set_target_branch(self):