generate_metadata.Git - add ability to commit any changes

* add shared.GitMixin specific tests
ploigos · Nov 11, 2021 · e265481 · e265481
1 parent 8943f81
commit e265481
Show file tree

Hide file tree

Showing 3 changed files with 646 additions and 14 deletions.
diff --git a/src/ploigos_step_runner/step_implementers/shared/git_mixin.py b/src/ploigos_step_runner/step_implementers/shared/git_mixin.py
@@ -107,7 +107,7 @@ def git_repo(self):
                 self.__git_repo = Repo(repo_root)
             except InvalidGitRepositoryError as error:
                 raise StepRunnerException(
-                    f'Given git-repo-root ({repo_root}) is not a Git repository'
+                    f'Given git-repo-root ({repo_root}) is not a Git repository: {error}'
                 ) from error
 
         return self.__git_repo
@@ -128,20 +128,19 @@ def git_url(self): # pylint: disable=too-many-branches
         if not self.__git_url:
             # get git url from config or current repo remote
             git_url = self.get_value(['git-url', 'url'])
-
             if not git_url:
-                git_url = self.git_repo.remote.url
-
-            # get given git username and pass
-            git_username = self.get_value('git-username')
-            git_password = self.get_value('git-password')
+                git_url = self.git_repo.remote().url
 
             # if git url is ssh, throw error if git username or password given
             # if git url is http|https combine git username and password with git url
             split_git_url = urlsplit(git_url)
             if split_git_url.scheme in ['ssh']:
                 self.__git_url = git_url
             elif split_git_url.scheme in ['http', 'https']:
+                # get given git username and pass
+                git_username = self.get_value('git-username')
+                git_password = self.get_value('git-password')
+
                 # determine git username
                 if split_git_url.username and git_username:
                     print(

diff --git a/tests/step_implementers/generate_metadata/test_git_generate_metadata.py b/tests/step_implementers/generate_metadata/test_git_generate_metadata.py
@@ -1,8 +1,7 @@
 
 from unittest.mock import PropertyMock, patch
 
-from git import InvalidGitRepositoryError
-from ploigos_step_runner import StepResult
+from ploigos_step_runner import StepResult, StepRunnerException
 from ploigos_step_runner.step_implementers.generate_metadata import Git
 from testfixtures import TempDirectory
 from tests.helpers.base_step_implementer_test_case import \
@@ -533,8 +532,8 @@ def test_success_pre_release_branch_custom_release_branch_regexes_empty(self, mo
 
             self.assertEqual(actual_step_result, expected_step_result)
 
-    @patch('git.Repo')
-    def test_fail_not_a_git_repo(self, mock_repo):
+    @patch.object(Git, 'git_repo', new_callable=PropertyMock)
+    def test_fail_getting_git_repo(self, mock_git_repo):
         with TempDirectory() as temp_dir:
             # setup
             step_config = {
@@ -547,7 +546,7 @@ def test_fail_not_a_git_repo(self, mock_repo):
             )
 
             # setup mocks
-            mock_repo.side_effect = InvalidGitRepositoryError()
+            mock_git_repo.side_effect = StepRunnerException('mock error')
 
             # run test
             actual_step_result = step_implementer._run_step()
@@ -559,8 +558,7 @@ def test_fail_not_a_git_repo(self, mock_repo):
                 sub_step_implementer_name='Git'
             )
             expected_step_result.success = False
-            expected_step_result.message = f'Given git-repo-root ({temp_dir.path})' \
-                ' is not a Git repository'
+            expected_step_result.message = f'mock error'
 
             self.assertEqual(actual_step_result, expected_step_result)