From 4c1b401e8250f9f520b3c7dc369554477ce8b15a Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.es>
Date: Thu, 9 Jan 2020 20:43:50 +0100
Subject: [PATCH] Added file cleanup in FileFieldTests.test_pickle().

---
 tests/model_fields/test_filefield.py | 38 +++++++++++++++++-----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/tests/model_fields/test_filefield.py b/tests/model_fields/test_filefield.py
index 5600051a356..67c08c984c1 100644
--- a/tests/model_fields/test_filefield.py
+++ b/tests/model_fields/test_filefield.py
@@ -110,19 +110,27 @@ class FileFieldTests(TestCase):
             file1 = File(fp, name='test_file.py')
             document = Document(myfile='test_file.py')
             document.myfile.save('test_file.py', file1)
+            try:
+                dump = pickle.dumps(document)
+                loaded_document = pickle.loads(dump)
+                self.assertEqual(document.myfile, loaded_document.myfile)
+                self.assertEqual(document.myfile.url, loaded_document.myfile.url)
+                self.assertEqual(
+                    document.myfile.storage,
+                    loaded_document.myfile.storage,
+                )
+                self.assertEqual(
+                    document.myfile.instance,
+                    loaded_document.myfile.instance,
+                )
+                self.assertEqual(document.myfile.field, loaded_document.myfile.field)
 
-            dump = pickle.dumps(document)
-            loaded_document = pickle.loads(dump)
-            self.assertEqual(document.myfile, loaded_document.myfile)
-            self.assertEqual(document.myfile.url, loaded_document.myfile.url)
-            self.assertEqual(document.myfile.storage, loaded_document.myfile.storage)
-            self.assertEqual(document.myfile.instance, loaded_document.myfile.instance)
-            self.assertEqual(document.myfile.field, loaded_document.myfile.field)
-
-            myfile_dump = pickle.dumps(document.myfile)
-            loaded_myfile = pickle.loads(myfile_dump)
-            self.assertEqual(document.myfile, loaded_myfile)
-            self.assertEqual(document.myfile.url, loaded_myfile.url)
-            self.assertEqual(document.myfile.storage, loaded_myfile.storage)
-            self.assertEqual(document.myfile.instance, loaded_myfile.instance)
-            self.assertEqual(document.myfile.field, loaded_myfile.field)
+                myfile_dump = pickle.dumps(document.myfile)
+                loaded_myfile = pickle.loads(myfile_dump)
+                self.assertEqual(document.myfile, loaded_myfile)
+                self.assertEqual(document.myfile.url, loaded_myfile.url)
+                self.assertEqual(document.myfile.storage, loaded_myfile.storage)
+                self.assertEqual(document.myfile.instance, loaded_myfile.instance)
+                self.assertEqual(document.myfile.field, loaded_myfile.field)
+            finally:
+                document.myfile.delete()