Author: kmtracey
Date: 2010-09-10 15:59:36 -0500 (Fri, 10 Sep 2010)
New Revision: 13727
Modified:
django/branches/releases/1.2.X/
django/branches/releases/1.2.X/tests/regressiontests/m2m_through_regress/tests.py
Log:
[1.2.X] Fixed #13799, a test failure on Postgres. Thanks, Alex.
r13400 from trunk.
Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702,13705,13709,13712,13715,13717
+
/django/trunk:1-13360,13400,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702,13705,13709,13712,13715,13717
Modified:
django/branches/releases/1.2.X/tests/regressiontests/m2m_through_regress/tests.py
===================================================================
---
django/branches/releases/1.2.X/tests/regressiontests/m2m_through_regress/tests.py
2010-09-10 20:55:09 UTC (rev 13726)
+++
django/branches/releases/1.2.X/tests/regressiontests/m2m_through_regress/tests.py
2010-09-10 20:59:36 UTC (rev 13727)
@@ -66,11 +66,13 @@
p = Person.objects.create(name="Bob")
g = Group.objects.create(name="Roll")
- Membership.objects.create(person=p, group=g)
+ m = Membership.objects.create(person=p, group=g)
+ pks = {"p_pk": p.pk, "g_pk": g.pk, "m_pk": m.pk}
+
out = StringIO()
management.call_command("dumpdata", "m2m_through_regress",
format="json", stdout=out)
- self.assertEqual(out.getvalue().strip(), """[{"pk": 1, "model":
"m2m_through_regress.membership", "fields": {"person": 1, "price": 100,
"group": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields":
{"name": "Bob"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields":
{"name": "Roll"}}]""")
+ self.assertEqual(out.getvalue().strip(), """[{"pk": %(m_pk)s, "model":
"m2m_through_regress.membership", "fields": {"person": %(p_pk)s, "price": 100,
"group": %(g_pk)s}}, {"pk": %(p_pk)s, "model": "m2m_through_regress.person",
"fields": {"name": "Bob"}}, {"pk": %(g_pk)s, "model":
"m2m_through_regress.group", "fields": {"name": "Roll"}}]""" % pks)
out = StringIO()
management.call_command("dumpdata", "m2m_through_regress",
format="xml",
@@ -78,19 +80,19 @@
self.assertEqual(out.getvalue().strip(), """
<?xml version="1.0" encoding="utf-8"?>
<django-objects version="1.0">
- <object pk="1" model="m2m_through_regress.membership">
- <field to="m2m_through_regress.person" name="person"
rel="ManyToOneRel">1</field>
- <field to="m2m_through_regress.group" name="group"
rel="ManyToOneRel">1</field>
+ <object pk="%(m_pk)s" model="m2m_through_regress.membership">
+ <field to="m2m_through_regress.person" name="person"
rel="ManyToOneRel">%(p_pk)s</field>
+ <field to="m2m_through_regress.group" name="group"
rel="ManyToOneRel">%(g_pk)s</field>
<field type="IntegerField" name="price">100</field>
</object>
- <object pk="1" model="m2m_through_regress.person">
+ <object pk="%(p_pk)s" model="m2m_through_regress.person">
<field type="CharField" name="name">Bob</field>
</object>
- <object pk="1" model="m2m_through_regress.group">
+ <object pk="%(g_pk)s" model="m2m_through_regress.group">
<field type="CharField" name="name">Roll</field>
</object>
</django-objects>
- """.strip())
+ """.strip() % pks)
def test_join_trimming(self):
"Check that we don't involve too many copies of the intermediate table
when doing a join. Refs #8046, #8254"
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
