From 92d5bedc56155e4c91c7644200415b3e42cdd31f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 3 Feb 2015 15:12:28 -0500 Subject: [1.8.x] Reverted "Fixed #24146 -- Fixed a missing fields regression in admin checks." This reverts commit e8171daf0cd7f0e070395cb4c850c17fea32f11d. A new solution is forthcoming. Backport of 0e489c19f1554ecfd9825daacfbac73be8ce723e from master --- tests/model_meta/tests.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py index bc7927c313..1a0c2de9f3 100644 --- a/tests/model_meta/tests.py +++ b/tests/model_meta/tests.py @@ -169,30 +169,24 @@ class GetFieldByNameTests(OptionsBaseTests): self.assertEqual(field_info[1:], (None, True, False)) self.assertIsInstance(field_info[0], GenericRelation) - def test_get_fields_when_apps_not_ready(self): + def test_get_fields_only_searches_forward_on_apps_not_ready(self): opts = Person._meta # If apps registry is not ready, get_field() searches over only # forward fields. opts.apps.ready = False - # Clear cached data. - opts.__dict__.pop('fields_map', None) try: # 'data_abstract' is a forward field, and therefore will be found self.assertTrue(opts.get_field('data_abstract')) msg = ( - "Person has no field named 'some_missing_field'. The app " + "Person has no field named 'relating_baseperson'. The app " "cache isn't ready yet, so if this is an auto-created related " - "field, it might not be available yet." + "field, it won't be available yet." ) + # 'data_abstract' is a reverse field, and will raise an exception with self.assertRaisesMessage(FieldDoesNotExist, msg): - opts.get_field('some_missing_field') - # Be sure it's not cached - self.assertNotIn('fields_map', opts.__dict__) + opts.get_field('relating_baseperson') finally: opts.apps.ready = True - # At this point searching a related field would cache fields_map - opts.get_field('relating_baseperson') - self.assertIn('fields_map', opts.__dict__) class RelationTreeTests(TestCase): -- cgit v1.3