From 31681c66a10c783bba2f75bc716a1a9abe658dea Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 10 Aug 2017 03:16:03 -0400 Subject: [PATCH] Fix menu test cases by not reseting the entire menu class cache, but only specific temporary test menus. Signed-off-by: Roberto Rosario --- mayan/apps/navigation/classes.py | 4 ++-- mayan/apps/navigation/tests/test_classes.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index db0cb30d3e..7920ef66e6 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -62,8 +62,8 @@ class Menu(object): return cls._registry[name] @classmethod - def reset(cls): - cls._registry = {} + def remove(cls, name): + del cls._registry[name] def __init__(self, name, icon=None, label=None): if name in self.__class__._registry: diff --git a/mayan/apps/navigation/tests/test_classes.py b/mayan/apps/navigation/tests/test_classes.py index cc6eee5586..bf210de043 100644 --- a/mayan/apps/navigation/tests/test_classes.py +++ b/mayan/apps/navigation/tests/test_classes.py @@ -121,12 +121,16 @@ class MenuClassTestCase(GenericViewTestCase): name=TEST_PERMISSION_NAME, label=TEST_PERMISSION_LABEL ) - Menu.reset() self.menu = Menu(name=TEST_MENU_NAME) self.sub_menu = Menu(name=TEST_SUBMENU_NAME) self.link = Link(text=TEST_LINK_TEXT, view=TEST_VIEW_NAME) Permission.invalidate_cache() + def tearDown(self): + Menu.remove(name=TEST_MENU_NAME) + Menu.remove(name=TEST_SUBMENU_NAME) + super(MenuClassTestCase, self).tearDown() + def test_null_source_link_unbinding(self): self.menu.bind_links(links=(self.link,))