From d196155bf7b5c9883a7cb8878f084c762759dc0b Mon Sep 17 00:00:00 2001 From: Jon Michael Aanes Date: Tue, 15 Apr 2025 23:39:01 +0200 Subject: [PATCH] Ruff after aider --- test/test_has_commits_on_branch.py | 38 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/test/test_has_commits_on_branch.py b/test/test_has_commits_on_branch.py index 86119c4..4affe9e 100644 --- a/test/test_has_commits_on_branch.py +++ b/test/test_has_commits_on_branch.py @@ -1,10 +1,7 @@ -import subprocess from pathlib import Path -from unittest.mock import patch, MagicMock +from unittest.mock import patch -import pytest - -from aider_gitea import has_commits_on_branch, get_commit_messages +from aider_gitea import has_commits_on_branch class TestHasCommitsOnBranch: @@ -17,32 +14,41 @@ class TestHasCommitsOnBranch: def test_has_commits_true(self, mock_get_commit_messages): # Setup mock to return some commit messages mock_get_commit_messages.return_value = ['Commit 1', 'Commit 2'] - + # Test function returns True when there are commits - assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is True - + assert ( + has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) + is True + ) + # Verify get_commit_messages was called with correct arguments mock_get_commit_messages.assert_called_once_with( - self.cwd, self.base_branch, self.current_branch + self.cwd, self.base_branch, self.current_branch, ) @patch('aider_gitea.get_commit_messages') def test_has_commits_false(self, mock_get_commit_messages): # Setup mock to return empty list mock_get_commit_messages.return_value = [] - + # Test function returns False when there are no commits - assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is False - + assert ( + has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) + is False + ) + # Verify get_commit_messages was called with correct arguments mock_get_commit_messages.assert_called_once_with( - self.cwd, self.base_branch, self.current_branch + self.cwd, self.base_branch, self.current_branch, ) @patch('aider_gitea.get_commit_messages') def test_has_commits_exception(self, mock_get_commit_messages): # Setup mock to raise an exception - mock_get_commit_messages.side_effect = Exception("Git command failed") - + mock_get_commit_messages.side_effect = Exception('Git command failed') + # Test function returns False when an exception occurs - assert has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) is False + assert ( + has_commits_on_branch(self.cwd, self.base_branch, self.current_branch) + is False + )