diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-21 13:45:29 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-21 13:45:29 +0000 |
| commit | b700c3a918a03ea0aa4fd16690af82c21813a6ae (patch) | |
| tree | 69fc4346c67d5c16bb0ba40799eb00343d4d8d67 | |
| parent | f21fc714eadcb90e1b61c0d86b34843f761516ea (diff) | |
Fixed #15364 -- Ensure files are closed correctly during file tests. Thanks to Mila for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/modeltests/files/tests.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/modeltests/files/tests.py b/tests/modeltests/files/tests.py index ad5c3a7cc3..fce3b4dcd8 100644 --- a/tests/modeltests/files/tests.py +++ b/tests/modeltests/files/tests.py @@ -30,6 +30,7 @@ class FileTests(TestCase): self.assertEqual(obj1.normal.name, "tests/django_test.txt") self.assertEqual(obj1.normal.size, 7) self.assertEqual(obj1.normal.read(), "content") + obj1.normal.close() # File objects can be assigned to FileField attributes, but shouldn't # get committed until the model it's attached to is saved. @@ -49,6 +50,7 @@ class FileTests(TestCase): self.assertEqual(obj1.normal.read(3), "con") self.assertEqual(obj1.normal.read(), "tent") self.assertEqual(list(obj1.normal.chunks(chunk_size=2)), ["co", "nt", "en", "t"]) + obj1.normal.close() # Save another file with the same name. obj2 = Storage() @@ -81,12 +83,14 @@ class FileTests(TestCase): obj3 = Storage.objects.create() self.assertEqual(obj3.default.name, "tests/default.txt") self.assertEqual(obj3.default.read(), "default content") + obj3.default.close() # But it shouldn't be deleted, even if there are no more objects using # it. obj3.delete() obj3 = Storage() self.assertEqual(obj3.default.read(), "default content") + obj3.default.close() # Verify the fix for #5655, making sure the directory is only # determined once. |