From 39a7c6498c850545238b59cd62fff204e0da23ec Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Fri, 30 Oct 2020 23:36:48 -0400 Subject: [PATCH] remove internal references to edx_django_utils Tests were referring to internal implementation details of edx-django-utils. This comment removes those references to free the library up to be refactored. ARCHBOM-1584 --- .../views/tests/test_course_index.py | 24 +++++++------------ .../waffle_utils/tests/test_views.py | 5 +--- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py index db92668e8f..e6d91c8497 100644 --- a/cms/djangoapps/contentstore/views/tests/test_course_index.py +++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py @@ -15,17 +15,16 @@ from django.conf import settings from django.core.exceptions import PermissionDenied from django.test.utils import override_settings from django.utils.translation import ugettext as _ -from edx_django_utils.monitoring.middleware import _DEFAULT_NAMESPACE as DJANGO_UTILS_NAMESPACE from opaque_keys.edx.locator import CourseLocator from search.api import perform_search -from cms.djangoapps.contentstore.config.waffle import WAFFLE_NAMESPACE as STUDIO_WAFFLE_NAMESPACE from cms.djangoapps.contentstore.courseware_index import CoursewareSearchIndexer, SearchIndexingError from cms.djangoapps.contentstore.tests.utils import CourseTestCase from cms.djangoapps.contentstore.utils import add_instructor, reverse_course_url, reverse_usage_url from course_action_state.managers import CourseRerunUIStateManager from course_action_state.models import CourseRerunState from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace +from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES from student.auth import has_course_author_access from student.roles import CourseStaffRole, GlobalStaff, LibraryUserRole from student.tests.factories import UserFactory @@ -33,7 +32,6 @@ from xmodule.modulestore.django import modulestore from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, LibraryFactory, check_mongo_calls -from ..course import WAFFLE_NAMESPACE as COURSE_WAFFLE_NAMESPACE from ..course import _deprecated_blocks_info, course_outline_initial_state, reindex_course_and_check_access from ..item import VisibilityState, create_xblock_info @@ -362,17 +360,11 @@ class TestCourseIndexArchived(CourseTestCase): for course in (self.course, self.active_course, self.archived_course): CourseStaffRole(course.id).add_users(self.staff) - # Make sure we've cached data which could change the query counts - # depending on test execution order - WaffleSwitchNamespace(name=COURSE_WAFFLE_NAMESPACE).is_enabled(u'enable_global_staff_optimization') - WaffleSwitchNamespace(name=STUDIO_WAFFLE_NAMESPACE).is_enabled(u'enable_policy_page') - WaffleSwitchNamespace(name=DJANGO_UTILS_NAMESPACE).is_enabled(u'enable_memory_middleware') - def check_index_page_with_query_count(self, separate_archived_courses, org, mongo_queries, sql_queries): """ Checks the index page, and ensures the number of database queries is as expected. """ - with self.assertNumQueries(sql_queries): + with self.assertNumQueries(sql_queries, table_blacklist=WAFFLE_TABLES): with check_mongo_calls(mongo_queries): self.check_index_page(separate_archived_courses=separate_archived_courses, org=org) @@ -395,13 +387,13 @@ class TestCourseIndexArchived(CourseTestCase): @ddt.data( # Staff user has course staff access - (True, 'staff', None, 3, 19), - (False, 'staff', None, 3, 19), + (True, 'staff', None, 3, 18), + (False, 'staff', None, 3, 18), # Base user has global staff access - (True, 'user', ORG, 3, 19), - (False, 'user', ORG, 3, 19), - (True, 'user', None, 3, 19), - (False, 'user', None, 3, 19), + (True, 'user', ORG, 3, 18), + (False, 'user', ORG, 3, 18), + (True, 'user', None, 3, 18), + (False, 'user', None, 3, 18), ) @ddt.unpack def test_separate_archived_courses(self, separate_archived_courses, username, org, mongo_queries, sql_queries): diff --git a/openedx/core/djangoapps/waffle_utils/tests/test_views.py b/openedx/core/djangoapps/waffle_utils/tests/test_views.py index de47e17d02..91bf5150aa 100644 --- a/openedx/core/djangoapps/waffle_utils/tests/test_views.py +++ b/openedx/core/djangoapps/waffle_utils/tests/test_views.py @@ -2,8 +2,6 @@ Tests for waffle utils views. """ from django.test import TestCase -from edx_django_utils.monitoring.code_owner import utils as code_owner_utils -from mock import patch from rest_framework.test import APIRequestFactory from waffle.testutils import override_switch @@ -50,8 +48,7 @@ class ToggleStateViewTests(TestCase): def test_code_owners_without_module_information(self): # Create a waffle flag without any associated module_name waffle_flag = WaffleFlag(TEST_WAFFLE_FLAG_NAMESPACE, "flag2", module_name=None) - with patch.object(code_owner_utils, "get_code_owner_mappings", return_value={}): - response = self._get_toggle_state_response(is_staff=True) + response = self._get_toggle_state_response(is_staff=True) result = [ flag for flag in response.data["waffle_flags"] if flag["name"] == waffle_flag.name