Fix cache leaks
This commit is contained in:
parent
178b9bdcc7
commit
105171d2ad
3 changed files with 15 additions and 14 deletions
|
@ -69,7 +69,7 @@ HELPER_SETTINGS = dict(
|
||||||
{'code': 'en'},
|
{'code': 'en'},
|
||||||
),
|
),
|
||||||
'default': {
|
'default': {
|
||||||
'fallback': 'en',
|
'fallbacks': ['en'],
|
||||||
'hide_untranslated': False,
|
'hide_untranslated': False,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -53,13 +53,13 @@ class BlogCategoryMenu(CMSAttachMenu):
|
||||||
posts = posts.active_translations(language).distinct()
|
posts = posts.active_translations(language).distinct()
|
||||||
for post in posts:
|
for post in posts:
|
||||||
post_id = None
|
post_id = None
|
||||||
|
parent = None
|
||||||
if categories_menu:
|
if categories_menu:
|
||||||
category = post.categories.first()
|
category = post.categories.first()
|
||||||
if category:
|
if category:
|
||||||
parent = '%s-%s' % (category.__class__.__name__, category.pk)
|
parent = '%s-%s' % (category.__class__.__name__, category.pk)
|
||||||
post_id = '%s-%s' % (post.__class__.__name__, post.pk),
|
post_id = '%s-%s' % (post.__class__.__name__, post.pk),
|
||||||
else:
|
else:
|
||||||
parent = None
|
|
||||||
post_id = '%s-%s' % (post.__class__.__name__, post.pk),
|
post_id = '%s-%s' % (post.__class__.__name__, post.pk),
|
||||||
if post_id:
|
if post_id:
|
||||||
node = NavigationNode(
|
node = NavigationNode(
|
||||||
|
|
|
@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, unicode_literals
|
||||||
|
|
||||||
from aldryn_apphooks_config.utils import get_app_instance
|
from aldryn_apphooks_config.utils import get_app_instance
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.utils.translation import activate
|
from django.utils.translation import activate, override
|
||||||
from menus.menu_pool import menu_pool
|
from menus.menu_pool import menu_pool
|
||||||
from parler.utils.context import smart_override, switch_language
|
from parler.utils.context import smart_override, switch_language
|
||||||
|
|
||||||
|
@ -32,28 +32,29 @@ class MenuTest(BaseTest):
|
||||||
# All cms menu modifiers should be removed from menu_pool.modifiers
|
# All cms menu modifiers should be removed from menu_pool.modifiers
|
||||||
# so that they do not interfere with our menu nodes
|
# so that they do not interfere with our menu nodes
|
||||||
menu_pool.modifiers = [m for m in menu_pool.modifiers if m.__module__.startswith('djangocms_blog')]
|
menu_pool.modifiers = [m for m in menu_pool.modifiers if m.__module__.startswith('djangocms_blog')]
|
||||||
|
cache.clear()
|
||||||
|
|
||||||
def test_menu_nodes(self):
|
def test_menu_nodes(self):
|
||||||
"""
|
"""
|
||||||
Tests if all categories are present in the menu
|
Tests if all categories are present in the menu
|
||||||
"""
|
"""
|
||||||
posts = self.get_posts()
|
posts = self.get_posts()
|
||||||
self.get_pages()
|
pages = self.get_pages()
|
||||||
|
|
||||||
for lang in ('en', 'it'):
|
for lang in ('en', 'it'):
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
cats_url = set([cat.get_absolute_url() for cat in self.cats if cat.has_translation(lang)])
|
cats_url = set([cat.get_absolute_url() for cat in self.cats if cat.has_translation(lang)])
|
||||||
self.assertTrue(cats_url.issubset(nodes_url))
|
self.assertTrue(cats_url.issubset(nodes_url))
|
||||||
menu_pool.clear()
|
|
||||||
|
|
||||||
|
cache.clear()
|
||||||
posts[0].categories.clear()
|
posts[0].categories.clear()
|
||||||
for lang in ('en', 'it'):
|
for lang in ('en', 'it'):
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
self.assertFalse(posts[0].get_absolute_url() in nodes_url)
|
self.assertFalse(posts[0].get_absolute_url() in nodes_url)
|
||||||
self.assertTrue(posts[1].get_absolute_url() in nodes_url)
|
self.assertTrue(posts[1].get_absolute_url() in nodes_url)
|
||||||
|
@ -82,7 +83,7 @@ class MenuTest(BaseTest):
|
||||||
for lang in languages:
|
for lang in languages:
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
self.assertFalse(cats_url[lang].issubset(nodes_url))
|
self.assertFalse(cats_url[lang].issubset(nodes_url))
|
||||||
self.assertFalse(posts_url[lang].issubset(nodes_url))
|
self.assertFalse(posts_url[lang].issubset(nodes_url))
|
||||||
|
@ -94,7 +95,7 @@ class MenuTest(BaseTest):
|
||||||
for lang in languages:
|
for lang in languages:
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
self.assertFalse(cats_url[lang].issubset(nodes_url))
|
self.assertFalse(cats_url[lang].issubset(nodes_url))
|
||||||
self.assertTrue(posts_url[lang].issubset(nodes_url))
|
self.assertTrue(posts_url[lang].issubset(nodes_url))
|
||||||
|
@ -106,7 +107,7 @@ class MenuTest(BaseTest):
|
||||||
for lang in languages:
|
for lang in languages:
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
self.assertTrue(cats_url[lang].issubset(nodes_url))
|
self.assertTrue(cats_url[lang].issubset(nodes_url))
|
||||||
self.assertFalse(posts_url[lang].issubset(nodes_url))
|
self.assertFalse(posts_url[lang].issubset(nodes_url))
|
||||||
|
@ -118,7 +119,7 @@ class MenuTest(BaseTest):
|
||||||
for lang in languages:
|
for lang in languages:
|
||||||
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
|
||||||
with smart_override(lang):
|
with smart_override(lang):
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
nodes_url = set([node.url for node in nodes])
|
nodes_url = set([node.url for node in nodes])
|
||||||
self.assertTrue(cats_url[lang].issubset(nodes_url))
|
self.assertTrue(cats_url[lang].issubset(nodes_url))
|
||||||
self.assertTrue(posts_url[lang].issubset(nodes_url))
|
self.assertTrue(posts_url[lang].issubset(nodes_url))
|
||||||
|
@ -147,7 +148,7 @@ class MenuTest(BaseTest):
|
||||||
view_obj.kwargs = {kwarg: obj.slug}
|
view_obj.kwargs = {kwarg: obj.slug}
|
||||||
view_obj.get(request)
|
view_obj.get(request)
|
||||||
# check if selected menu node points to cat
|
# check if selected menu node points to cat
|
||||||
nodes = menu_pool.get_nodes(request, namespace='BlogCategoryMenu')
|
nodes = menu_pool.get_nodes(request)
|
||||||
found = False
|
found = False
|
||||||
for node in nodes:
|
for node in nodes:
|
||||||
if node.selected:
|
if node.selected:
|
||||||
|
|
Loading…
Reference in a new issue