diff --git a/tests/basic/test_deprecated.py b/tests/basic/test_deprecated.py index 5e601a444..c7622944e 100644 --- a/tests/basic/test_deprecated.py +++ b/tests/basic/test_deprecated.py @@ -5,8 +5,8 @@ from unittest.mock import MagicMock, patch from prompt_toolkit.input import DummyInput from prompt_toolkit.output import DummyOutput -from aider.main import main from aider.deprecated import handle_deprecated_model_args +from aider.main import main class TestDeprecated(TestCase): @@ -24,31 +24,33 @@ class TestDeprecated(TestCase): def test_deprecated_args_show_warnings(self, mock_tool_warning): # Test all deprecated flags to ensure they show warnings deprecated_flags = [ - "--opus", - "--sonnet", - "--haiku", - "--4", - "--4o", - "--mini", - "--4-turbo", - "--3", - "--deepseek", - "--o1-mini", - "--o1-preview" + "--opus", + "--sonnet", + "--haiku", + "--4", + "--4o", + "--mini", + "--4-turbo", + "--3", + "--deepseek", + "--o1-mini", + "--o1-preview", ] - + for flag in deprecated_flags: mock_tool_warning.reset_mock() - + with patch("aider.models.Model"), self.subTest(flag=flag): - main([flag, "--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput()) - + main( + [flag, "--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput() + ) + mock_tool_warning.assert_called_once() warning_msg = mock_tool_warning.call_args[0][0] - + # Remove any leading hyphens for the comparison - flag_in_msg = flag.lstrip('-') - + flag_in_msg = flag.lstrip("-") + self.assertIn(flag_in_msg, warning_msg) self.assertIn("deprecated", warning_msg) self.assertIn("use --model", warning_msg.lower()) @@ -58,8 +60,10 @@ class TestDeprecated(TestCase): # Test that the warning uses the model alias if available with patch("aider.models.MODEL_ALIASES", {"gpt4": "gpt-4-0613"}): with patch("aider.models.Model"): - main(["--4", "--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput()) - + main( + ["--4", "--no-git", "--exit", "--yes"], input=DummyInput(), output=DummyOutput() + ) + mock_tool_warning.assert_called_once() warning_msg = mock_tool_warning.call_args[0][0] self.assertIn("--model gpt4", warning_msg) @@ -79,19 +83,19 @@ class TestDeprecated(TestCase): ("o1_mini", "o1-mini"), ("o1_preview", "o1-preview"), ] - + for flag, expected_model in test_cases: with self.subTest(flag=flag): # Create a mock IO instance mock_io = MagicMock() - + # Create args with the flag set to True args = MagicMock() args.model = None setattr(args, flag, True) - + # Call the handle_deprecated_model_args function handle_deprecated_model_args(args, mock_io) - + # Check that args.model was set to the expected model self.assertEqual(args.model, expected_model)