mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #24558 -- Made dumpdata mapping ordering deterministic.

Browse source 
Thanks to gfairchild for the report and Claude for the review.
This commit is contained in:
Simon Charette 2015-04-01 15:42:09 -04:00
parent 147ac85613
commit 5bc3123479
6 changed files with 69 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
tests/serializers/tests.py
View file

@ -266,6 +266,17 @@ class SerializersTestBase(object):
obj.save()
self.assertEqual(Category.objects.all().count(), 5)
def test_deterministic_mapping_ordering(self):
"""Mapping such as fields should be deterministically ordered. (#24558)"""
output = serializers.serialize(self.serializer_name, [self.a1], indent=2)
categories = self.a1.categories.values_list('pk', flat=True)
self.assertEqual(output, self.mapping_ordering_str % {
'article_pk': self.a1.pk,
'author_pk': self.a1.author_id,
'first_category_pk': categories[0],
'second_category_pk': categories[1],
})
class SerializersTransactionTestBase(object):
@ -303,6 +314,15 @@ class XmlSerializerTestCase(SerializersTestBase, TestCase):
<field type="CharField" name="name">Non-fiction</field>
</object>
</django-objects>"""
mapping_ordering_str = """<?xml version="1.0" encoding="utf-8"?>
<django-objects version="1.0">
<object model="serializers.article" pk="%(article_pk)s">
<field name="author" rel="ManyToOneRel" to="serializers.author">%(author_pk)s</field>
<field name="headline" type="CharField">Poker has no place on ESPN</field>
<field name="pub_date" type="DateTimeField">2006-06-16T11:00:00</field>
<field name="categories" rel="ManyToManyRel" to="serializers.category"><object pk="%(first_category_pk)s"></object><object pk="%(second_category_pk)s"></object></field>
</object>
</django-objects>"""
@staticmethod
def _comparison_value(value):
@ -373,6 +393,22 @@ class JsonSerializerTestCase(SerializersTestBase, TestCase):
"model": "serializers.category",
"fields": {"name": "Non-fiction"}
}]"""
mapping_ordering_str = """[
{
"model": "serializers.article",
"pk": %(article_pk)s,
"fields": {
"author": %(author_pk)s,
"headline": "Poker has no place on ESPN",
"pub_date": "2006-06-16T11:00:00",
"categories": [
%(first_category_pk)s,
%(second_category_pk)s
]
}
}
]
"""
@staticmethod
def _validate_output(serial_str):
@ -533,6 +569,15 @@ class YamlSerializerTestCase(SerializersTestBase, TestCase):
name: Non-fiction
model: serializers.category"""
mapping_ordering_str = """- model: serializers.article
pk: %(article_pk)s
fields:
author: %(author_pk)s
headline: Poker has no place on ESPN
pub_date: 2006-06-16 11:00:00
categories: [%(first_category_pk)s, %(second_category_pk)s]
"""
@staticmethod
def _validate_output(serial_str):
try: