Skip to content

Commit

Permalink
chore: removed enable_big_blue_button flag
Browse files Browse the repository at this point in the history
  • Loading branch information
ayesha-waris committed Jan 8, 2024
1 parent 7c6795b commit 5eddb2c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ class TestFieldOverrideSplitPerformance(FieldOverridePerformanceTestCase):
__test__ = True

# TODO: decrease query count as part of REVO-28
QUERY_COUNT = 32
QUERY_COUNT = 33

TEST_DATA = {
('no_overrides', 1, True, False): (QUERY_COUNT, 2),
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/tests/test_model_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def test_set_field_in_missing_student_module(self):
# on the StudentModule).
# Django 1.8 also has a number of other BEGIN and SAVESTATE queries.
with self.assertNumQueries(4, using='default'):
with self.assertNumQueries(2, using='student_module_history'):
with self.assertNumQueries(1, using='student_module_history'):
self.kvs.set(user_state_key('a_field'), 'a_value')

assert 1 == sum(len(cache) for cache in self.field_data_cache.cache.values())
Expand Down
10 changes: 5 additions & 5 deletions lms/djangoapps/courseware/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def test_index_query_counts(self):
self.client.login(username=self.user.username, password=self.user_password)
CourseEnrollment.enroll(self.user, course.id)

with self.assertNumQueries(177, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with self.assertNumQueries(178, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with check_mongo_calls(3):
url = reverse(
'courseware_section',
Expand Down Expand Up @@ -1491,8 +1491,8 @@ def test_view_certificate_link(self):
self.assertContains(resp, "earned a certificate for this course.")

@ddt.data(
(True, 53),
(False, 53),
(True, 54),
(False, 54),
)
@ddt.unpack
def test_progress_queries_paced_courses(self, self_paced, query_count):
Expand All @@ -1507,13 +1507,13 @@ def test_progress_queries(self):
ContentTypeGatingConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
self.setup_course()
with self.assertNumQueries(
53, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
54, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
), check_mongo_calls(2):
self._get_progress_page()

for _ in range(2):
with self.assertNumQueries(
37, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
38, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST
), check_mongo_calls(2):
self._get_progress_page()

Expand Down
20 changes: 0 additions & 20 deletions openedx/core/djangoapps/course_live/config/waffle.py

This file was deleted.

4 changes: 1 addition & 3 deletions openedx/core/djangoapps/course_live/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
from typing import List, Dict
from django.conf import settings

from openedx.core.djangoapps.course_live.config.waffle import ENABLE_BIG_BLUE_BUTTON


class LiveProvider(ABC):
"""
Expand Down Expand Up @@ -120,7 +118,7 @@ def has_free_tier(self) -> bool:

@property
def is_enabled(self) -> bool:
return ENABLE_BIG_BLUE_BUTTON.is_enabled()
return True

@staticmethod
def get_global_keys() -> Dict:
Expand Down
1 change: 0 additions & 1 deletion openedx/core/djangoapps/course_live/tests/test_tab.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import ddt
from django.test import RequestFactory
from edx_toggles.toggles.testutils import override_waffle_flag
from lti_consumer.models import CourseAllowPIISharingInLTIFlag, LtiConfiguration

from lms.djangoapps.courseware.tests.test_tabs import TabTestCase
Expand Down
4 changes: 0 additions & 4 deletions openedx/core/djangoapps/course_live/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@
import ddt
from django.test import RequestFactory
from django.urls import reverse
from edx_toggles.toggles.testutils import override_waffle_flag
from lti_consumer.models import CourseAllowPIISharingInLTIFlag, LtiConfiguration
from markupsafe import Markup
from rest_framework.test import APITestCase
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.django_utils import CourseUserType, ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory

from ..config.waffle import ENABLE_BIG_BLUE_BUTTON
from ..models import CourseLiveConfiguration
from ..providers import ProviderManager


@ddt.ddt
@override_waffle_flag(ENABLE_BIG_BLUE_BUTTON, True)
class TestCourseLiveConfigurationView(ModuleStoreTestCase, APITestCase):
"""
Unit tests for the CourseLiveConfigurationView.
Expand Down Expand Up @@ -355,7 +352,6 @@ def test_create_configurations_response_free_tier(self, provider, share_email, s
self.assertEqual(content, expected_data)


@override_waffle_flag(ENABLE_BIG_BLUE_BUTTON, True)
class TestCourseLiveProvidersView(ModuleStoreTestCase, APITestCase):
"""
Tests for course live provider view
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_queries(self):

# Fetch the view and verify that the query counts haven't changed
# TODO: decrease query count as part of REVO-28
with self.assertNumQueries(52, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with self.assertNumQueries(53, table_ignorelist=QUERY_COUNT_TABLE_IGNORELIST):
with check_mongo_calls(3):
url = course_updates_url(self.course)
self.client.get(url)

0 comments on commit 5eddb2c

Please sign in to comment.