From 8199c78def830176be6bb4ee07086d0e45887ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 12 Jan 2021 15:52:55 +0100 Subject: [PATCH] Remove soon-to-be-deprecated value monitor in edx-toggles The WAFFLE_FLAG_CUSTOM_ATTRIBUTES setting and the WaffleFlag.set_monitor_value method are soon going to be deprecated in edx-toggles. This is going to be done in a backward-compatible manner, but we'd better be safe by removing references to these objects early. --- openedx/core/djangoapps/waffle_utils/__init__.py | 1 - openedx/core/djangoapps/waffle_utils/tests/test_init.py | 3 --- 2 files changed, 4 deletions(-) diff --git a/openedx/core/djangoapps/waffle_utils/__init__.py b/openedx/core/djangoapps/waffle_utils/__init__.py index 2db50f1e85..235d14a739 100644 --- a/openedx/core/djangoapps/waffle_utils/__init__.py +++ b/openedx/core/djangoapps/waffle_utils/__init__.py @@ -196,6 +196,5 @@ class CourseWaffleFlag(LegacyWaffleFlag): ) is_enabled_for_course = self._get_course_override_value(course_key) if is_enabled_for_course is not None: - self.set_monitor_value(is_enabled_for_course) return is_enabled_for_course return super().is_enabled() diff --git a/openedx/core/djangoapps/waffle_utils/tests/test_init.py b/openedx/core/djangoapps/waffle_utils/tests/test_init.py index 4b317f7904..c12a55539c 100644 --- a/openedx/core/djangoapps/waffle_utils/tests/test_init.py +++ b/openedx/core/djangoapps/waffle_utils/tests/test_init.py @@ -6,7 +6,6 @@ import crum import ddt from django.test import TestCase from django.test.client import RequestFactory -from django.test.utils import override_settings from edx_django_utils.cache import RequestCache from mock import patch from opaque_keys.edx.keys import CourseKey @@ -44,7 +43,6 @@ class TestCourseWaffleFlag(TestCase): crum.set_current_request(request) RequestCache.clear_all_namespaces() - @override_settings(WAFFLE_FLAG_CUSTOM_ATTRIBUTES=[NAMESPACED_FLAG_NAME]) @ddt.data( {'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.on, 'waffle_enabled': False, 'result': True}, {'course_override': WaffleFlagCourseOverrideModel.ALL_CHOICES.off, 'waffle_enabled': True, 'result': False}, @@ -80,7 +78,6 @@ class TestCourseWaffleFlag(TestCase): second_value = False self.assertEqual(self.TEST_COURSE_FLAG.is_enabled(self.TEST_COURSE_2_KEY), second_value) - @override_settings(WAFFLE_FLAG_CUSTOM_ATTRIBUTES=[NAMESPACED_FLAG_NAME]) def test_undefined_waffle_flag(self): """ Test flag with undefined waffle flag.