From 9aaee49c5177af9d350e2f12c018a05bd125e84b Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Wed, 5 Jul 2023 14:09:31 -0700 Subject: [PATCH] tests pass on windows --- tests/test_wholefile.py | 255 +++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 135 deletions(-) diff --git a/tests/test_wholefile.py b/tests/test_wholefile.py index cf06dba7f..0237515cf 100644 --- a/tests/test_wholefile.py +++ b/tests/test_wholefile.py @@ -1,4 +1,5 @@ import os +import shutil import tempfile import unittest from pathlib import Path @@ -11,179 +12,163 @@ from aider.io import InputOutput class TestWholeFileCoder(unittest.TestCase): def setUp(self): self.original_cwd = os.getcwd() + self.tempdir = tempfile.mkdtemp() + os.chdir(self.tempdir) def tearDown(self): os.chdir(self.original_cwd) + shutil.rmtree(self.tempdir, ignore_errors=True) def test_update_files(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) + # Create a sample file in the temporary directory + sample_file = "sample.txt" + with open(sample_file, "w") as f: + f.write("Original content\n") - # Create a sample file in the temporary directory - sample_file = "sample.txt" - with open(sample_file, "w") as f: - f.write("Original content\n") + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) + # Set the partial response content with the updated content + coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" - # Set the partial response content with the updated content - coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" + # Call update_files method + edited_files = coder.update_files() - # Call update_files method - edited_files = coder.update_files() + # Check if the sample file was updated + self.assertIn("sample.txt", edited_files) - # Check if the sample file was updated - self.assertIn("sample.txt", edited_files) - - # Check if the content of the sample file was updated - with open(sample_file, "r") as f: - updated_content = f.read() - self.assertEqual(updated_content, "Updated content\n") + # Check if the content of the sample file was updated + with open(sample_file, "r") as f: + updated_content = f.read() + self.assertEqual(updated_content, "Updated content\n") def test_update_files_with_existing_fence(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) - - # Create a sample file in the temporary directory - sample_file = "sample.txt" - original_content = """ + # Create a sample file in the temporary directory + sample_file = "sample.txt" + original_content = """ Here is some quoted text: ``` Quote! ``` """ - with open(sample_file, "w") as f: - f.write(original_content) + with open(sample_file, "w") as f: + f.write(original_content) - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) - coder.choose_fence() + coder.choose_fence() - self.assertNotEqual(coder.fence[0], "```") + self.assertNotEqual(coder.fence[0], "```") - # Set the partial response content with the updated content - coder.partial_response_content = ( - f"{sample_file}\n{coder.fence[0]}\nUpdated content\n{coder.fence[1]}" - ) + # Set the partial response content with the updated content + coder.partial_response_content = ( + f"{sample_file}\n{coder.fence[0]}\nUpdated content\n{coder.fence[1]}" + ) - # Call update_files method - edited_files = coder.update_files() + # Call update_files method + edited_files = coder.update_files() - # Check if the sample file was updated - self.assertIn("sample.txt", edited_files) + # Check if the sample file was updated + self.assertIn("sample.txt", edited_files) - # Check if the content of the sample file was updated - with open(sample_file, "r") as f: - updated_content = f.read() - self.assertEqual(updated_content, "Updated content\n") + # Check if the content of the sample file was updated + with open(sample_file, "r") as f: + updated_content = f.read() + self.assertEqual(updated_content, "Updated content\n") def test_update_files_bogus_path_prefix(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) + # Create a sample file in the temporary directory + sample_file = "sample.txt" + with open(sample_file, "w") as f: + f.write("Original content\n") - # Create a sample file in the temporary directory - sample_file = "sample.txt" - with open(sample_file, "w") as f: - f.write("Original content\n") + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) + # Set the partial response content with the updated content + # With path/to/ prepended onto the filename + coder.partial_response_content = f"path/to/{sample_file}\n```\nUpdated content\n```" - # Set the partial response content with the updated content - # With path/to/ prepended onto the filename - coder.partial_response_content = f"path/to/{sample_file}\n```\nUpdated content\n```" + # Call update_files method + edited_files = coder.update_files() - # Call update_files method - edited_files = coder.update_files() + # Check if the sample file was updated + self.assertIn("sample.txt", edited_files) - # Check if the sample file was updated - self.assertIn("sample.txt", edited_files) - - # Check if the content of the sample file was updated - with open(sample_file, "r") as f: - updated_content = f.read() - self.assertEqual(updated_content, "Updated content\n") + # Check if the content of the sample file was updated + with open(sample_file, "r") as f: + updated_content = f.read() + self.assertEqual(updated_content, "Updated content\n") def test_update_files_not_in_chat(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) + # Create a sample file in the temporary directory + sample_file = "sample.txt" + with open(sample_file, "w") as f: + f.write("Original content\n") - # Create a sample file in the temporary directory - sample_file = "sample.txt" - with open(sample_file, "w") as f: - f.write("Original content\n") + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io) - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io) + # Set the partial response content with the updated content + coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" - # Set the partial response content with the updated content - coder.partial_response_content = f"{sample_file}\n```\nUpdated content\n```" + # Call update_files method + edited_files = coder.update_files() - # Call update_files method - edited_files = coder.update_files() + # Check if the sample file was updated + self.assertIn("sample.txt", edited_files) - # Check if the sample file was updated - self.assertIn("sample.txt", edited_files) - - # Check if the content of the sample file was updated - with open(sample_file, "r") as f: - updated_content = f.read() - self.assertEqual(updated_content, "Updated content\n") + # Check if the content of the sample file was updated + with open(sample_file, "r") as f: + updated_content = f.read() + self.assertEqual(updated_content, "Updated content\n") def test_update_files_no_filename_single_file_in_chat(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) + sample_file = "accumulate.py" + content = ( + "def accumulate(collection, operation):\n return [operation(x) for x in" + " collection]\n" + ) - sample_file = "accumulate.py" - content = ( - "def accumulate(collection, operation):\n return [operation(x) for x in" - " collection]\n" - ) + with open(sample_file, "w") as f: + f.write("Original content\n") - with open(sample_file, "w") as f: - f.write("Original content\n") + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[sample_file]) + # Set the partial response content with the updated content + coder.partial_response_content = ( + f"Here's the modified `{sample_file}` file that implements the `accumulate`" + f" function as per the given instructions:\n\n```\n{content}```\n\nThis" + " implementation uses a list comprehension to apply the `operation` function to" + " each element of the `collection` and returns the resulting list." + ) - # Set the partial response content with the updated content - coder.partial_response_content = ( - f"Here's the modified `{sample_file}` file that implements the `accumulate`" - f" function as per the given instructions:\n\n```\n{content}```\n\nThis" - " implementation uses a list comprehension to apply the `operation` function to" - " each element of the `collection` and returns the resulting list." - ) + # Call update_files method + edited_files = coder.update_files() - # Call update_files method - edited_files = coder.update_files() + # Check if the sample file was updated + self.assertIn(sample_file, edited_files) - # Check if the sample file was updated - self.assertIn(sample_file, edited_files) - - # Check if the content of the sample file was updated - with open(sample_file, "r") as f: - updated_content = f.read() - self.assertEqual(updated_content, content) + # Check if the content of the sample file was updated + with open(sample_file, "r") as f: + updated_content = f.read() + self.assertEqual(updated_content, content) def test_update_files_earlier_filename(self): - with tempfile.TemporaryDirectory() as temp_dir: - os.chdir(temp_dir) - print(temp_dir) + fname_a = Path("a.txt") + fname_b = Path("b.txt") - fname_a = Path("a.txt") - fname_b = Path("b.txt") + fname_a.write_text("before a\n") + fname_b.write_text("before b\n") - fname_a.write_text("before a\n") - fname_b.write_text("before b\n") - - response = """ + response = """ Here is a new version of `a.txt` for you to consider: ``` @@ -196,22 +181,22 @@ And here is `b.txt`: after b ``` """ - # Initialize WholeFileCoder with the temporary directory - io = InputOutput(yes=True) - coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[fname_a, fname_b]) + # Initialize WholeFileCoder with the temporary directory + io = InputOutput(yes=True) + coder = WholeFileCoder(main_model=models.GPT35, io=io, fnames=[fname_a, fname_b]) - # Set the partial response content with the updated content - coder.partial_response_content = response + # Set the partial response content with the updated content + coder.partial_response_content = response - # Call update_files method - edited_files = coder.update_files() + # Call update_files method + edited_files = coder.update_files() - # Check if the sample file was updated - self.assertIn(str(fname_a), edited_files) - self.assertIn(str(fname_b), edited_files) + # Check if the sample file was updated + self.assertIn(str(fname_a), edited_files) + self.assertIn(str(fname_b), edited_files) - self.assertEqual(fname_a.read_text(), "after a\n") - self.assertEqual(fname_b.read_text(), "after b\n") + self.assertEqual(fname_a.read_text(), "after a\n") + self.assertEqual(fname_b.read_text(), "after b\n") if __name__ == "__main__":