Commits

Anonymous committed eda2db4

[1.0.X] Fixed #9592 -- Create data for the generic_inline_admin test during setup instead of via a fixutre since it uses a content type id which will vary depending on what other tests have been run.

r9438 from trunk.

  • Participants
  • Parent commits fc49bff
  • Branches releases/1.0.X

Comments (0)

Files changed (2)

tests/regressiontests/generic_inline_admin/fixtures/model-data.xml

-<?xml version="1.0" encoding="utf-8"?>
-<django-objects version="1.0">
-    <object pk="1" model="generic_inline_admin.Episode">
-        <field type="CharField" name="name">This Week in Django</field>
-    </object>
-    <object pk="1" model="generic_inline_admin.Media">
-        <field type="ForeignKey" name="content_type">13</field>
-        <field type="PositiveIntegerField" name="object_id">1</field>
-        <field type="URLField" name="url">http://example.com/podcast.mp3</field>
-    </object>
-</django-objects>

tests/regressiontests/generic_inline_admin/tests.py

 from models import Episode, Media
 
 class GenericAdminViewTest(TestCase):
-    fixtures = ['users.xml', 'model-data.xml']
+    fixtures = ['users.xml']
 
     def setUp(self):
         # set TEMPLATE_DEBUG to True to ensure {% include %} will raise
         self.original_template_debug = settings.TEMPLATE_DEBUG
         settings.TEMPLATE_DEBUG = True
         self.client.login(username='super', password='secret')
+        
+        # Can't load content via a fixture (since the GenericForeignKey
+        # relies on content type IDs, which will vary depending on what
+        # other tests have been run), thus we do it here.
+        e = Episode.objects.create(name='This Week in Django')
+        m = Media(content_object=e, url='http://example.com/podcast.mp3')
+        m.save()
     
     def tearDown(self):
         self.client.logout()