diff --git a/AUTHORS b/AUTHORS index 2148c64322..40df3589c0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -747,6 +747,7 @@ answer newbie questions, and generally made Django that much better: Nicolas Lara Nicolas Noé Nikita Marchant + Nikita Sobolev Niran Babalola Nis Jørgensen Nowell Strite diff --git a/django/apps/registry.py b/django/apps/registry.py index 0683f3ad3c..92de6075fc 100644 --- a/django/apps/registry.py +++ b/django/apps/registry.py @@ -373,6 +373,7 @@ class Apps: This is mostly used in tests. """ + self.get_swappable_settings_name.cache_clear() # Call expire cache on each model. This will purge # the relation tree and the fields cache. self.get_models.cache_clear() diff --git a/tests/apps/tests.py b/tests/apps/tests.py index 9f989c5d9a..ecfb70162f 100644 --- a/tests/apps/tests.py +++ b/tests/apps/tests.py @@ -197,6 +197,17 @@ class AppsTests(SimpleTestCase): with self.assertRaises(ValueError): apps.get_model("admin_LogEntry") + @override_settings(INSTALLED_APPS=SOME_INSTALLED_APPS) + def test_clear_cache(self): + # Set cache. + self.assertIsNone(apps.get_swappable_settings_name("admin.LogEntry")) + apps.get_models() + + apps.clear_cache() + + self.assertEqual(apps.get_swappable_settings_name.cache_info().currsize, 0) + self.assertEqual(apps.get_models.cache_info().currsize, 0) + @override_settings(INSTALLED_APPS=["apps.apps.RelabeledAppsConfig"]) def test_relabeling(self): self.assertEqual(apps.get_app_config("relabeled").name, "apps")