diff options
| author | Anssi Kääriäinen <anssi.kaariainen@thl.fi> | 2015-02-16 09:49:19 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-20 13:11:59 -0500 |
| commit | 6f03a4ca91ed22b2ea42d5159a1ed00f347cf9aa (patch) | |
| tree | 115834bb97180990cc93d0a25238686f591a37cb /tests/model_meta | |
| parent | 3a6c37fce452a3bbf185b5e58dd3e7c89b456b19 (diff) | |
[1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation
Backport of bad5f262bf4a17f157808ec1aa225ba9c94c1eee from master
Diffstat (limited to 'tests/model_meta')
| -rw-r--r-- | tests/model_meta/tests.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py index ef526b7bc4..c77a286308 100644 --- a/tests/model_meta/tests.py +++ b/tests/model_meta/tests.py @@ -228,11 +228,9 @@ class RelationTreeTests(TestCase): sorted([field.related_query_name() for field in Relation._meta._relation_tree if not field.rel.field.rel.is_hidden()]), sorted([ - 'fk_abstract_rel', 'fk_abstract_rel', 'fk_abstract_rel', 'fk_base_rel', 'fk_base_rel', - 'fk_base_rel', 'fk_concrete_rel', 'fk_concrete_rel', 'fo_abstract_rel', 'fo_abstract_rel', - 'fo_abstract_rel', 'fo_base_rel', 'fo_base_rel', 'fo_base_rel', 'fo_concrete_rel', - 'fo_concrete_rel', 'm2m_abstract_rel', 'm2m_abstract_rel', 'm2m_abstract_rel', - 'm2m_base_rel', 'm2m_base_rel', 'm2m_base_rel', 'm2m_concrete_rel', 'm2m_concrete_rel', + 'fk_abstract_rel', 'fk_base_rel', 'fk_concrete_rel', 'fo_abstract_rel', + 'fo_base_rel', 'fo_concrete_rel', 'm2m_abstract_rel', + 'm2m_base_rel', 'm2m_concrete_rel' ]) ) # Testing hidden related objects @@ -243,9 +241,8 @@ class RelationTreeTests(TestCase): 'BasePerson_following_base+', 'BasePerson_following_base+', 'BasePerson_friends_abstract+', 'BasePerson_friends_abstract+', 'BasePerson_friends_base+', 'BasePerson_friends_base+', 'BasePerson_m2m_abstract+', 'BasePerson_m2m_base+', 'Relating_basepeople+', - 'Relating_basepeople_hidden+', 'followers_abstract', 'followers_abstract', 'followers_abstract', - 'followers_base', 'followers_base', 'followers_base', 'friends_abstract_rel_+', 'friends_abstract_rel_+', - 'friends_abstract_rel_+', 'friends_base_rel_+', 'friends_base_rel_+', 'friends_base_rel_+', 'person', + 'Relating_basepeople_hidden+', 'followers_abstract', + 'followers_base', 'friends_abstract_rel_+', 'friends_base_rel_+', 'person', 'relating_basepeople', 'relating_baseperson', ]) ) |