mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-21 21:04:59 +00:00
1733fe4c90
# Aider chat conversation:
USER: in `test_get_commit_message`, the mock_send return value needs to match the commit_message = response.choices[0].message.content
ASSISTANT: To match the return value of `mock_send` with `commit_message = response.choices[0].message.content`, we need to modify the return value of `mock_send` in the `test_get_commit_message` function in the `tests/test_repo.py` file.
The `send_with_retries` function returns a tuple where the second element is the response from the OpenAI API. The response is expected to be an object with a `choices` attribute, which is a list of objects, each with a `message` attribute, which in turn has a `content` attribute.
So, we need to return a mock response object that has these attributes. Here's how to do it:
```python
tests/test_repo.py
<<<<<<< ORIGINAL
mock_send.return_value = (
None,
"a good commit message"
)
=======
mock_response = MagicMock()
mock_response.choices = [MagicMock()]
mock_response.choices[0].message.content = "a good commit message"
mock_send.return_value = (
None,
mock_response
)
>>>>>>> UPDATED
```
This change will make the `mock_send` function return a mock response object that has the same structure as the actual response from the OpenAI API, allowing the `get_commit_message` method to correctly extract the commit message.
98 lines
3.5 KiB
Python
98 lines
3.5 KiB
Python
import os
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import git
|
|
import openai
|
|
|
|
from aider import models
|
|
from aider.dump import dump # noqa: F401
|
|
from aider.io import InputOutput
|
|
from aider.repo import AiderRepo
|
|
from tests.utils import GitTemporaryDirectory
|
|
|
|
|
|
class TestRepo(unittest.TestCase):
|
|
@patch("aider.repo.send_with_retries")
|
|
def test_get_commit_message(self, mock_send):
|
|
# Set the return value of the mocked function
|
|
mock_response = MagicMock()
|
|
mock_response.choices = [MagicMock()]
|
|
mock_response.choices[0].message.content = "a good commit message"
|
|
mock_send.return_value = (
|
|
None,
|
|
mock_response
|
|
)
|
|
|
|
repo = AiderRepo(InputOutput(), None)
|
|
# Call the get_commit_message method with dummy diff and context
|
|
result = repo.get_commit_message("dummy diff", "dummy context")
|
|
|
|
# Assert that the returned message is the expected one
|
|
self.assertEqual(result, "a good commit message")
|
|
|
|
def test_get_commit_message_strip_quotes(self):
|
|
# Mock the IO object
|
|
mock_io = MagicMock()
|
|
|
|
# Initialize the Coder object with the mocked IO and mocked repo
|
|
coder = Coder.create(models.GPT4, None, mock_io)
|
|
|
|
# Mock the send method to set partial_response_content and return False
|
|
def mock_send(*args, **kwargs):
|
|
coder.partial_response_content = "a good commit message"
|
|
return False
|
|
|
|
coder.send = MagicMock(side_effect=mock_send)
|
|
|
|
# Call the get_commit_message method with dummy diff and context
|
|
result = coder.get_commit_message("dummy diff", "dummy context")
|
|
|
|
# Assert that the returned message is the expected one
|
|
self.assertEqual(result, "a good commit message")
|
|
|
|
def test_get_tracked_files(self):
|
|
# Create a temporary directory
|
|
tempdir = Path(tempfile.mkdtemp())
|
|
|
|
# Initialize a git repository in the temporary directory and set user name and email
|
|
repo = git.Repo.init(tempdir)
|
|
repo.config_writer().set_value("user", "name", "Test User").release()
|
|
repo.config_writer().set_value("user", "email", "testuser@example.com").release()
|
|
|
|
# Create three empty files and add them to the git repository
|
|
filenames = ["README.md", "subdir/fänny.md", "systemüber/blick.md", 'file"with"quotes.txt']
|
|
created_files = []
|
|
for filename in filenames:
|
|
file_path = tempdir / filename
|
|
try:
|
|
file_path.parent.mkdir(parents=True, exist_ok=True)
|
|
file_path.touch()
|
|
repo.git.add(str(file_path))
|
|
created_files.append(Path(filename))
|
|
except OSError:
|
|
# windows won't allow files with quotes, that's ok
|
|
self.assertIn('"', filename)
|
|
self.assertEqual(os.name, "nt")
|
|
|
|
self.assertTrue(len(created_files) >= 3)
|
|
|
|
repo.git.commit("-m", "added")
|
|
|
|
# Create a Coder object on the temporary directory
|
|
coder = Coder.create(
|
|
models.GPT4,
|
|
None,
|
|
io=InputOutput(),
|
|
fnames=[str(tempdir / filenames[0])],
|
|
)
|
|
|
|
tracked_files = coder.get_tracked_files()
|
|
|
|
# On windows, paths will come back \like\this, so normalize them back to Paths
|
|
tracked_files = [Path(fn) for fn in tracked_files]
|
|
|
|
# Assert that coder.get_tracked_files() returns the three filenames
|
|
self.assertEqual(set(tracked_files), set(created_files))
|