Merge remote-tracking branch 'origin/add_request_files_to_post_comment' into add_request_files_to_post_comment

# Conflicts:
#	tests/custom_comments/__init__.py

Author: DominicLGit

tests/testapp/tests/__init__.py

@@ -39,6 +39,10 @@ def setUpTestData(cls):
             email="joe.normal@example.com",
         )
 
+    def tearDown(self):
+        super().tearDown()
+        shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
+
     def createSomeComments(self):
         # Two anonymous comments on two different objects
         c1 = get_model().objects.create(