dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 18:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

test: improve test clarity with skipIf and assertion messages

Browse source 
Co-authored-by: aider (vertex_ai/gemini-2.5-pro-exp-03-25) <noreply@aider.dev>
This commit is contained in:
Andrew Grigorev 2025-04-12 20:00:44 +03:00
parent 6a970c3515
commit 5851d66174
1 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

39
tests/basic/test_repo.py
View file

@ -165,14 +165,11 @@ class TestRepo(unittest.TestCase):
args = mock_send.call_args[0] # Get positional args args = mock_send.call_args[0] # Get positional args
self.assertEqual(args[0][0]["content"], custom_prompt) # Check first message content self.assertEqual(args[0][0]["content"], custom_prompt) # Check first message content
@unittest.skipIf(platform.system() == "Windows", "Git env var behavior differs on Windows")
@patch("aider.repo.GitRepo.get_commit_message") @patch("aider.repo.GitRepo.get_commit_message")
def test_commit_with_custom_committer_name(self, mock_send): def test_commit_with_custom_committer_name(self, mock_send):
mock_send.return_value = '"a good commit message"' mock_send.return_value = '"a good commit message"'
# Cleanup of the git temp dir explodes on windows
if platform.system() == "Windows":
return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# new repo # new repo
raw_repo = git.Repo() raw_repo = git.Repo()
@ -229,14 +226,11 @@ class TestRepo(unittest.TestCase):
commit_result = git_repo_user_no_committer.commit(fnames=[str(fname)], aider_edits=False) commit_result = git_repo_user_no_committer.commit(fnames=[str(fname)], aider_edits=False)
self.assertIsNotNone(commit_result) self.assertIsNotNone(commit_result)
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertEqual(commit.author.name, "Test User") # Author never modified for user commits self.assertEqual(commit.author.name, "Test User", msg="Author name should not be modified for user commits")
self.assertEqual(commit.committer.name, "Test User") # Explicit False prevents modification self.assertEqual(commit.committer.name, "Test User", msg="Committer name should not be modified when attribute_committer=False")
@unittest.skipIf(platform.system() == "Windows", "Git env var behavior differs on Windows")
def test_commit_with_co_authored_by(self): def test_commit_with_co_authored_by(self):
# Cleanup of the git temp dir explodes on windows
if platform.system() == "Windows":
return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# new repo # new repo
raw_repo = git.Repo() raw_repo = git.Repo()
@ -274,14 +268,12 @@ class TestRepo(unittest.TestCase):
self.assertIn("Co-authored-by: aider (gpt-test) <noreply@aider.dev>", commit.message) self.assertIn("Co-authored-by: aider (gpt-test) <noreply@aider.dev>", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider edit") self.assertEqual(commit.message.splitlines()[0], "Aider edit")
# With default (None), co-authored-by takes precedence # With default (None), co-authored-by takes precedence
self.assertEqual(commit.author.name, "Test User") # Should NOT be modified self.assertEqual(commit.author.name, "Test User", msg="Author name should not be modified when co-authored-by takes precedence")
self.assertEqual(commit.committer.name, "Test User") # Should NOT be modified self.assertEqual(commit.committer.name, "Test User", msg="Committer name should not be modified when co-authored-by takes precedence")
@unittest.skipIf(platform.system() == "Windows", "Git env var behavior differs on Windows")
def test_commit_co_authored_by_with_explicit_name_modification(self): def test_commit_co_authored_by_with_explicit_name_modification(self):
# Test scenario where Co-authored-by is true AND author/committer modification are explicitly True # Test scenario where Co-authored-by is true AND author/committer modification are explicitly True
if platform.system() == "Windows":
return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# Setup repo... # Setup repo...
# new repo # new repo
@ -319,15 +311,13 @@ class TestRepo(unittest.TestCase):
self.assertIn("Co-authored-by: aider (gpt-test-combo) <noreply@aider.dev>", commit.message) self.assertIn("Co-authored-by: aider (gpt-test-combo) <noreply@aider.dev>", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider combo edit") self.assertEqual(commit.message.splitlines()[0], "Aider combo edit")
# When co-authored-by is true BUT author/committer are explicit True, modification SHOULD happen # When co-authored-by is true BUT author/committer are explicit True, modification SHOULD happen
self.assertEqual(commit.author.name, "Test User (aider)") # Should be modified self.assertEqual(commit.author.name, "Test User (aider)", msg="Author name should be modified when explicitly True, even with co-author")
self.assertEqual(commit.committer.name, "Test User (aider)") # Should be modified self.assertEqual(commit.committer.name, "Test User (aider)", msg="Committer name should be modified when explicitly True, even with co-author")
@unittest.skipIf(platform.system() == "Windows", "Git env var behavior differs on Windows")
def test_commit_ai_edits_no_coauthor_explicit_false(self): def test_commit_ai_edits_no_coauthor_explicit_false(self):
# Test AI edits (aider_edits=True) when co-authored-by is False, # Test AI edits (aider_edits=True) when co-authored-by is False,
# but author or committer attribution is explicitly disabled. # but author or committer attribution is explicitly disabled.
if platform.system() == "Windows":
return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# Setup repo # Setup repo
raw_repo = git.Repo() raw_repo = git.Repo()
@ -375,8 +365,8 @@ class TestRepo(unittest.TestCase):
self.assertIsNotNone(commit_result) self.assertIsNotNone(commit_result)
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertNotIn("Co-authored-by:", commit.message) self.assertNotIn("Co-authored-by:", commit.message)
self.assertEqual(commit.author.name, "Test User (aider)") # Default True self.assertEqual(commit.author.name, "Test User (aider)", msg="Author name should be modified (default True) when co-author=False")
self.assertEqual(commit.committer.name, "Test User") # Explicit False self.assertEqual(commit.committer.name, "Test User", msg="Committer name should not be modified (explicit False) when co-author=False")
def test_get_tracked_files(self): def test_get_tracked_files(self):
# Create a temporary directory # Create a temporary directory
@ -574,12 +564,9 @@ class TestRepo(unittest.TestCase):
commit_result = git_repo.commit(fnames=[str(fname)]) commit_result = git_repo.commit(fnames=[str(fname)])
self.assertIsNone(commit_result) self.assertIsNone(commit_result)
@unittest.skipIf(platform.system() == "Windows", "Git hook execution differs on Windows")
def test_git_commit_verify(self): def test_git_commit_verify(self):
"""Test that git_commit_verify controls whether --no-verify is passed to git commit""" """Test that git_commit_verify controls whether --no-verify is passed to git commit"""
# Skip on Windows as hook execution works differently
if platform.system() == "Windows":
return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# Create a new repo # Create a new repo
raw_repo = git.Repo() raw_repo = git.Repo()