diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 41a04e89..a56a6c87 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,11 @@ Change Log .. There should always be an "Unreleased" section for changes pending release. +[1.1.1] - 2020-10-27 +~~~~~~~~~~~~~~~~~~~~ + +* Fix cache-checking in WaffleSwitchNamespace + [1.1.0] - 2020-10-23 ~~~~~~~~~~~~~~~~~~~~ diff --git a/edx_toggles/__init__.py b/edx_toggles/__init__.py index 6fc19ba6..98642e5f 100644 --- a/edx_toggles/__init__.py +++ b/edx_toggles/__init__.py @@ -2,6 +2,6 @@ Library and utilities for feature toggles. """ -__version__ = '1.1.0' +__version__ = '1.1.1' default_app_config = 'edx_toggles.apps.TogglesConfig' # pylint: disable=invalid-name diff --git a/edx_toggles/tests/test_toggles.py b/edx_toggles/tests/test_toggles.py index d48a6b6c..291775ad 100644 --- a/edx_toggles/tests/test_toggles.py +++ b/edx_toggles/tests/test_toggles.py @@ -97,3 +97,8 @@ def test_namespaced_switch_name(self): expected = self.NAMESPACE_NAME + "." + self.WAFFLE_SWITCH_NAME actual = self.WAFFLE_SWITCH.namespaced_switch_name self.assertEqual(actual, expected) + + def test_caching(self): + namespace = toggles.WaffleSwitchNamespace("namespace") + namespace.set_request_cache_with_short_name("switch1", True) + self.assertTrue(namespace.is_enabled("switch1")) diff --git a/edx_toggles/toggles/internal/waffle.py b/edx_toggles/toggles/internal/waffle.py index ca559328..fefa7114 100644 --- a/edx_toggles/toggles/internal/waffle.py +++ b/edx_toggles/toggles/internal/waffle.py @@ -56,8 +56,8 @@ def is_enabled(self, switch_name): """ Returns and caches whether the given waffle switch is enabled. """ - value = self.get_request_cache(switch_name) namespaced_switch_name = self._namespaced_name(switch_name) + value = self.get_request_cache(namespaced_switch_name) if value is None: value = switch_is_active(namespaced_switch_name) self.set_request_cache(namespaced_switch_name, value)