[1.2.X] Fixed #15364 -- Ensure files are closed correctly during file tests. Thanks to Mila for the report and patch.
Backport of r15604 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e636db1066
commit
bf4507f255
|
@ -27,6 +27,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.
|
||||
|
@ -46,6 +47,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()
|
||||
|
@ -78,12 +80,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.
|
||||
|
|
Loading…
Reference in New Issue