[1.0.X] Fixed #9786 -- Fixed inequality checking for django.db.models.fields.file.FieldFile class.

Backport of r9647 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9648 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 16 insertions, 4 deletions

diff --git a/tests/regressiontests/file_storage/models.py b/tests/regressiontests/file_storage/models.py
index 2575a15d3a..32fb83b348 100644
--- a/tests/regressiontests/file_storage/models.py
+++ b/tests/regressiontests/file_storage/models.py
@@ -22,12 +22,12 @@ except ImportError:
 if Image:
     class Person(models.Model):
         name = models.CharField(max_length=50)
-        mugshot = models.ImageField(storage=temp_storage, upload_to='tests', 
-                                    height_field='mug_height', 
+        mugshot = models.ImageField(storage=temp_storage, upload_to='tests',
+                                    height_field='mug_height',
                                     width_field='mug_width')
         mug_height = models.PositiveSmallIntegerField()
         mug_width = models.PositiveSmallIntegerField()
-        
+
     __test__ = {'API_TESTS': """
 
 >>> image_data = open(os.path.join(os.path.dirname(__file__), "test.png"), 'rb').read()
@@ -42,6 +42,18 @@ if Image:
 >>> p.mug_width
 16
 
+# Bug #9786: Ensure '==' and '!=' work correctly.
+>>> image_data = open(os.path.join(os.path.dirname(__file__), "test1.png"), 'rb').read()
+>>> p1 = Person(name="Bob")
+>>> p1.mugshot.save("mug", ContentFile(image_data))
+>>> p2 = Person.objects.get(name="Joe")
+>>> p.mugshot == p2.mugshot
+True
+>>> p.mugshot != p2.mugshot
+False
+>>> p.mugshot != p1.mugshot
+True
+
 # Bug #8175: correctly delete files that have been removed off the file system.
 >>> import os
 >>> p2 = Person(name="Fred")
@@ -69,4 +81,4 @@ False
 
 >>> shutil.rmtree(temp_storage_dir)
 """}
-    
\ No newline at end of file
+
diff --git a/tests/regressiontests/file_storage/test1.png b/tests/regressiontests/file_storage/test1.png
new file mode 100644
index 0000000000..bc9874113d
--- /dev/null
+++ b/tests/regressiontests/file_storage/test1.png