From fc4948d5747c9e64d0b51f481ebcb76f4c433deb Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Mon, 1 Sep 2008 22:28:18 +0000 Subject: [PATCH] Fixed #8770: made some tests more robust under MySQL. Thanks, Alex Gaynor. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8821 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../model_inheritance_regress/models.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/regressiontests/model_inheritance_regress/models.py b/tests/regressiontests/model_inheritance_regress/models.py index 45c516a855..c3ab0bc5aa 100644 --- a/tests/regressiontests/model_inheritance_regress/models.py +++ b/tests/regressiontests/model_inheritance_regress/models.py @@ -98,12 +98,12 @@ __test__ = {'API_TESTS':""" [, ] >>> dicts = Restaurant.objects.values('name','serves_hot_dogs') ->>> [sorted(d.items()) for d in dicts] -[[('name', u"Guido's House of Pasta"), ('serves_hot_dogs', True)]] +>>> [sorted(d.items()) for d in dicts] == [[('name', u"Guido's House of Pasta"), ('serves_hot_dogs', True)]] +True >>> dicts = ItalianRestaurant.objects.values('name','serves_hot_dogs','serves_gnocchi') ->>> [sorted(d.items()) for d in dicts] -[[('name', u"Guido's House of Pasta"), ('serves_gnocchi', True), ('serves_hot_dogs', True)]] +>>> [sorted(d.items()) for d in dicts] == [[('name', u"Guido's House of Pasta"), ('serves_gnocchi', True), ('serves_hot_dogs', True)]] +True >>> dicts = ParkingLot.objects.values('name','capacity') >>> [sorted(d.items()) for d in dicts] @@ -130,12 +130,12 @@ __test__ = {'API_TESTS':""" [, ] >>> dicts = Restaurant.objects.values('name','serves_hot_dogs') ->>> [sorted(d.items()) for d in dicts] -[[('name', u"Guido's All New House of Pasta"), ('serves_hot_dogs', False)]] +>>> [sorted(d.items()) for d in dicts] == [[('name', u"Guido's All New House of Pasta"), ('serves_hot_dogs', False)]] +True >>> dicts = ItalianRestaurant.objects.values('name','serves_hot_dogs','serves_gnocchi') ->>> [sorted(d.items()) for d in dicts] -[[('name', u"Guido's All New House of Pasta"), ('serves_gnocchi', False), ('serves_hot_dogs', False)]] +>>> [sorted(d.items()) for d in dicts] == [[('name', u"Guido's All New House of Pasta"), ('serves_gnocchi', False), ('serves_hot_dogs', False)]] +True >>> dicts = ParkingLot.objects.values('name','capacity') >>> [sorted(d.items()) for d in dicts] @@ -150,8 +150,8 @@ __test__ = {'API_TESTS':""" # Note that the name has not changed # - name is an attribute of Place, not ItalianRestaurant >>> dicts = ItalianRestaurant.objects.values('name','serves_hot_dogs','serves_gnocchi') ->>> [sorted(d.items()) for d in dicts] -[[('name', u"Guido's All New House of Pasta"), ('serves_gnocchi', False), ('serves_hot_dogs', False)]] +>>> [sorted(d.items()) for d in dicts] == [[('name', u"Guido's All New House of Pasta"), ('serves_gnocchi', False), ('serves_hot_dogs', False)]] +True # Regressions tests for #7105: dates() queries should be able to use fields # from the parent model as easily as the child.