From e50fe2469deb5550481a0e01fd6910e092bbc767 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sun, 28 May 2023 22:40:37 -0700
Subject: [PATCH] aider: Added setUp and tearDown methods to TestCommands class
 to remember the current working directory, create a temporary directory, and
 change the working directory to the temporary directory in setUp, and change
 the working directory back to the original directory in tearDown.

# Context:
USER: add setUp and tearDown. in setUp, make a remember the cwd, make a tempdir and chdir there. in teardown, chdir back to the original dir
ASSISTANT: I will add `setUp` and `tearDown` methods to the `TestCommands` class in the `tests/test_commands.py` file. In the `setUp` method, I will
^C KeyboardInterrupt
USER: add setUp and tearDown. in setUp, make a remember the cwd, make a tempdir and chdir there. in teardown, chdir back to the original dir
ASSISTANT: I will add `setUp` and `tearDown` methods to the `TestCommands` class in the `tests/test_commands.py` file. In the `setUp` method, I will remember the current working directory, create a temporary directory, and change the working directory to the temporary directory. In the `tearDown` method, I will change the working directory back to the original directory.

Here are the changes:

```python
tests/test_commands.py
<<<<<<< ORIGINAL
class TestCommands(TestCase):
    def test_cmd_add(self):
=======
import shutil

class TestCommands(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)

    def test_cmd_add(self):
>>>>>>> UPDATED
```
---
 tests/test_commands.py | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/tests/test_commands.py b/tests/test_commands.py
index c7f686dd5..7cdca3a95 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -4,26 +4,29 @@ from unittest import TestCase
 from aider.commands import Commands
 from aider.io import InputOutput
 
+import shutil
+
 class TestCommands(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)
+
     def test_cmd_add(self):
-        original_cwd = os.getcwd()
+        # Initialize the Commands and InputOutput objects
+        io = InputOutput(pretty=False, yes=True)
+        from aider.coder import Coder
 
-        with tempfile.TemporaryDirectory() as tmpdir:
-            os.chdir(tmpdir)
+        coder = Coder(io, openai_api_key="deadbeef")
+        commands = Commands(io, coder)
 
-            # Initialize the Commands and InputOutput objects
-            io = InputOutput(pretty=False, yes=True)
-            from aider.coder import Coder
+        # Call the cmd_add method with 'foo.txt' and 'bar.txt' as a single string
+        commands.cmd_add("foo.txt bar.txt")
 
-            coder = Coder(io, openai_api_key="deadbeef")
-            commands = Commands(io, coder)
-
-            # Call the cmd_add method with 'foo.txt' and 'bar.txt' as a single string
-            commands.cmd_add("foo.txt bar.txt")
-
-            # Check if both files have been created in the temporary directory
-            self.assertTrue(os.path.exists("foo.txt"))
-            self.assertTrue(os.path.exists("bar.txt"))
-
-        # The working directory is automatically restored after the context manager exits
-        assert os.getcwd() == original_cwd
+        # Check if both files have been created in the temporary directory
+        self.assertTrue(os.path.exists("foo.txt"))
+        self.assertTrue(os.path.exists("bar.txt"))