dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-29 08:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixed tests

Browse source
This commit is contained in:
Paul Gauthier 2023-10-25 15:31:23 -07:00
parent 277a92b3c6
commit 95f2b4546e
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tests/test_editblock.py
View file

@ -67,11 +67,11 @@ Here's the change:
```text ```text
foo.txt foo.txt
<<<<<<< HEAD <<<<<<< SEARCH
Two Two
======= =======
Tooooo Tooooo
>>>>>>> updated >>>>>>> REPLACE
``` ```
Hope you like it! Hope you like it!
@ -86,11 +86,11 @@ Here's the change:
foo.txt foo.txt
```text ```text
<<<<<<< HEAD <<<<<<< SEARCH
Two Two
======= =======
Tooooo Tooooo
>>>>>>> updated >>>>>>> REPLACE
``` ```
Hope you like it! Hope you like it!
@ -105,7 +105,7 @@ Here's the change:
```text ```text
foo.txt foo.txt
<<<<<<< HEAD <<<<<<< SEARCH
Two Two
======= =======
Tooooo Tooooo
@ -123,7 +123,7 @@ oops!
Here's the change: Here's the change:
```text ```text
<<<<<<< HEAD <<<<<<< SEARCH
Two Two
======= =======
Tooooo Tooooo
@ -139,34 +139,34 @@ oops!
def test_find_original_update_blocks_no_final_newline(self): def test_find_original_update_blocks_no_final_newline(self):
edit = """ edit = """
aider/coder.py aider/coder.py
<<<<<<< HEAD <<<<<<< SEARCH
self.console.print("[red]^C again to quit") self.console.print("[red]^C again to quit")
======= =======
self.io.tool_error("^C again to quit") self.io.tool_error("^C again to quit")
>>>>>>> updated >>>>>>> REPLACE
aider/coder.py aider/coder.py
<<<<<<< HEAD <<<<<<< SEARCH
self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...") self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...")
self.io.tool_error(err) self.io.tool_error(err)
======= =======
self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...") self.io.tool_error("Malformed ORIGINAL/UPDATE blocks, retrying...")
self.io.tool_error(str(err)) self.io.tool_error(str(err))
>>>>>>> updated >>>>>>> REPLACE
aider/coder.py aider/coder.py
<<<<<<< HEAD <<<<<<< SEARCH
self.console.print("[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n") self.console.print("[red]Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.\n")
======= =======
self.io.tool_error("Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.") self.io.tool_error("Unable to get commit message from gpt-3.5-turbo. Use /commit to try again.")
>>>>>>> updated >>>>>>> REPLACE
aider/coder.py aider/coder.py
<<<<<<< HEAD <<<<<<< SEARCH
self.console.print("[red]Skipped commmit.") self.console.print("[red]Skipped commmit.")
======= =======
self.io.tool_error("Skipped commmit.") self.io.tool_error("Skipped commmit.")
>>>>>>> updated""" >>>>>>> REPLACE"""
# Should not raise a ValueError # Should not raise a ValueError
list(eb.find_original_update_blocks(edit)) list(eb.find_original_update_blocks(edit))
@ -177,7 +177,7 @@ No problem! Here are the changes to patch `subprocess.check_output` instead of `
```python ```python
tests/test_repomap.py tests/test_repomap.py
<<<<<<< HEAD <<<<<<< SEARCH
def test_check_for_ctags_failure(self): def test_check_for_ctags_failure(self):
with patch("subprocess.run") as mock_run: with patch("subprocess.run") as mock_run:
mock_run.side_effect = Exception("ctags not found") mock_run.side_effect = Exception("ctags not found")
@ -185,9 +185,9 @@ tests/test_repomap.py
def test_check_for_ctags_failure(self): def test_check_for_ctags_failure(self):
with patch("subprocess.check_output") as mock_check_output: with patch("subprocess.check_output") as mock_check_output:
mock_check_output.side_effect = Exception("ctags not found") mock_check_output.side_effect = Exception("ctags not found")
>>>>>>> updated >>>>>>> REPLACE
<<<<<<< HEAD <<<<<<< SEARCH
def test_check_for_ctags_success(self): def test_check_for_ctags_success(self):
with patch("subprocess.run") as mock_run: with patch("subprocess.run") as mock_run:
mock_run.return_value = CompletedProcess(args=["ctags", "--version"], returncode=0, stdout='''{ mock_run.return_value = CompletedProcess(args=["ctags", "--version"], returncode=0, stdout='''{
@ -207,7 +207,7 @@ tests/test_repomap.py
"pattern": "/^ status = main()$/", "pattern": "/^ status = main()$/",
"kind": "variable" "kind": "variable"
}''' }'''
>>>>>>> updated >>>>>>> REPLACE
``` ```
These changes replace the `subprocess.run` patches with `subprocess.check_output` patches in both `test_check_for_ctags_failure` and `test_check_for_ctags_success` tests. These changes replace the `subprocess.run` patches with `subprocess.check_output` patches in both `test_check_for_ctags_failure` and `test_check_for_ctags_success` tests.
@ -286,11 +286,11 @@ These changes replace the `subprocess.run` patches with `subprocess.check_output
Do this: Do this:
{Path(file1).name} {Path(file1).name}
<<<<<<< HEAD <<<<<<< SEARCH
two two
======= =======
new new
>>>>>>> updated >>>>>>> REPLACE
""" """
coder.partial_response_function_call = dict() coder.partial_response_function_call = dict()
@ -328,11 +328,11 @@ new
Do this: Do this:
{Path(file1).name} {Path(file1).name}
<<<<<<< HEAD <<<<<<< SEARCH
two two
======= =======
new new
>>>>>>> updated >>>>>>> REPLACE
""" """
coder.partial_response_function_call = dict() coder.partial_response_function_call = dict()
@ -351,19 +351,19 @@ Here's the change:
```text ```text
foo.txt foo.txt
<<<<<<< HEAD <<<<<<< SEARCH
one one
======= =======
two two
>>>>>>> updated >>>>>>> REPLACE
... ...
<<<<<<< HEAD <<<<<<< SEARCH
three three
======= =======
four four
>>>>>>> updated >>>>>>> REPLACE
``` ```
Hope you like it! Hope you like it!