From b70042435a6602ce08ea081e23a02faaff0bc4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 29 Oct 2020 11:01:29 +0100 Subject: [PATCH] Deprecate waffle_utils.testutils.override* functions These functions should from now on be imported from edx_toggles.toggles.testutils. --- lms/djangoapps/courseware/tests/test_course_info.py | 5 +++-- lms/djangoapps/courseware/tests/test_masquerade.py | 2 +- lms/djangoapps/courseware/tests/test_views.py | 6 +++--- openedx/core/djangoapps/waffle_utils/tests/test_views.py | 4 ++-- openedx/core/djangoapps/waffle_utils/testutils.py | 5 ----- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py index 925b9a6f96..20111336bf 100644 --- a/lms/djangoapps/courseware/tests/test_course_info.py +++ b/lms/djangoapps/courseware/tests/test_course_info.py @@ -14,16 +14,17 @@ from django.conf import settings from django.http import QueryDict from django.test.utils import override_settings from django.urls import reverse -from pyquery import PyQuery as pq +from edx_toggles.toggles.testutils import override_waffle_flag from six import text_type from lms.djangoapps.ccx.tests.factories import CcxFactory from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context -from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES, override_waffle_flag +from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES from openedx.features.content_type_gating.models import ContentTypeGatingConfig from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG from openedx.features.enterprise_support.tests.mixins.enterprise import EnterpriseTestConsentRequired +from pyquery import PyQuery as pq from student.models import CourseEnrollment from student.tests.factories import AdminFactory from util.date_utils import strftime_localized diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py index 1fbd29ef8f..5db5dee3f0 100644 --- a/lms/djangoapps/courseware/tests/test_masquerade.py +++ b/lms/djangoapps/courseware/tests/test_masquerade.py @@ -13,6 +13,7 @@ import six from django.conf import settings from django.test import TestCase from django.urls import reverse +from edx_toggles.toggles.testutils import override_waffle_flag from mock import patch from pytz import UTC from xblock.runtime import DictKeyValueStore @@ -29,7 +30,6 @@ from lms.djangoapps.courseware.tests.test_submitting_problems import ProblemSubm from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration from openedx.core.djangoapps.user_api.preferences.api import get_user_preference, set_user_preference -from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag from openedx.features.course_experience import DISABLE_UNIFIED_COURSE_TAB_FLAG from student.models import CourseEnrollment from student.tests.factories import UserFactory diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 1007bc758a..7efe81977d 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -22,7 +22,7 @@ from django.test import RequestFactory, TestCase from django.test.client import Client from django.test.utils import override_settings from django.urls import reverse, reverse_lazy -from freezegun import freeze_time +from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch from markupsafe import escape from milestones.tests.utils import MilestonesTestCaseMixin from mock import MagicMock, PropertyMock, call, create_autospec, patch @@ -40,7 +40,7 @@ import lms.djangoapps.courseware.views.views as views from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from course_modes.models import CourseMode from course_modes.tests.factories import CourseModeFactory -from edx_toggles.toggles.testutils import override_waffle_flag +from freezegun import freeze_time from lms.djangoapps.certificates import api as certs_api from lms.djangoapps.certificates.models import ( CertificateGenerationConfiguration, @@ -74,7 +74,7 @@ from openedx.core.djangoapps.content.course_overviews.models import CourseOvervi from openedx.core.djangoapps.crawlers.models import CrawlersConfig from openedx.core.djangoapps.credit.api import set_credit_requirements from openedx.core.djangoapps.credit.models import CreditCourse, CreditProvider -from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES, override_waffle_switch +from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES from openedx.core.djangolib.testing.utils import get_mock_request from openedx.core.lib.gating import api as gating_api from openedx.core.lib.url_utils import quote_slashes diff --git a/openedx/core/djangoapps/waffle_utils/tests/test_views.py b/openedx/core/djangoapps/waffle_utils/tests/test_views.py index 91bf5150aa..26410eade3 100644 --- a/openedx/core/djangoapps/waffle_utils/tests/test_views.py +++ b/openedx/core/djangoapps/waffle_utils/tests/test_views.py @@ -2,13 +2,13 @@ Tests for waffle utils views. """ from django.test import TestCase +from edx_toggles.toggles.testutils import override_waffle_flag from rest_framework.test import APIRequestFactory from waffle.testutils import override_switch from student.tests.factories import UserFactory -from .. import WaffleFlag, WaffleFlagNamespace, WaffleSwitch, WaffleSwitchNamespace -from ..testutils import override_waffle_flag +from .. import WaffleFlag, WaffleFlagNamespace from ..views import ToggleStateView TEST_WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace('test') diff --git a/openedx/core/djangoapps/waffle_utils/testutils.py b/openedx/core/djangoapps/waffle_utils/testutils.py index 896e81dfff..fcaf8f1ab2 100644 --- a/openedx/core/djangoapps/waffle_utils/testutils.py +++ b/openedx/core/djangoapps/waffle_utils/testutils.py @@ -2,11 +2,6 @@ Test utilities for waffle utilities. """ -# Import from edx-toggles to preserve import paths -# TODO: Deprecate and remove -# pylint: disable=unused-import -from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch - # Can be used with FilteredQueryCountMixin.assertNumQueries() to blacklist # waffle tables. For example: # QUERY_COUNT_TABLE_BLACKLIST = WAFFLE_TABLES