Changeset 9357 for django/trunk/tests/regressiontests/fixtures_regress/models.py

Timestamp:

11/06/08 05:19:13 (2 months ago)

Author:

russellm

Message:

Fixed #9011 -- Corrected handling of fixture files that contain errors to correctly report the broken fixture name. Thanks to jlrivitti@gmail.com for the report and initial patch.

Files:

• django/trunk/tests/regressiontests/fixtures_regress/models.py (modified) (4 diffs)

django/trunk/tests/regressiontests/fixtures_regress/models.py

@@ -8 +8 @@
-    latin_name = models.CharField(max_length=150)
-    count = models.IntegerField()
-
+
-    def __unicode__(self):
-        return self.common_name
@@ -57 +57 @@
-    title = models.CharField(max_length=255)
-    channels = models.ManyToManyField(Channel)
-
+
-    class Meta:
-        ordering = ('id',)
@@ -114 +114 @@
-No fixture data found for 'bad_fixture2'. (File format may be invalid.)
-
+# Loading a fixture file with no data returns an error
+>>> management.call_command('loaddata', 'empty', verbosity=0)
+No fixture data found for 'empty'. (File format may be invalid.)
+
+# If any of the fixtures contain an error, loading is aborted
+# (Regression for #9011 - error message is correct)
+>>> management.call_command('loaddata', 'bad_fixture2', 'animal', verbosity=0)
+No fixture data found for 'bad_fixture2'. (File format may be invalid.)
+
->>> sys.stderr = savestderr
-
@@ -124 +133 @@
-
-###############################################
- 
+
-# used to create tables, load data, and then query over that data.
-# To compensate, we close the connection after running loaddata.