Merge pull request #29073 from edx/ddumesnil/update-edx-when-version-aa-1058

chore: AA-1058: Update edx-when version
2021-10-25 06:06:33 -07:00
parent fd6802746c 78fbd28f41
commit 4917c8dc8b
11 changed files with 34 additions and 34 deletions
--- a/lms/djangoapps/ccx/tests/test_field_override_performance.py
+++ b/lms/djangoapps/ccx/tests/test_field_override_performance.py
@@ -242,7 +242,7 @@ class TestFieldOverrideMongoPerformance(FieldOverridePerformanceTestCase):
    __test__ = True

    # TODO: decrease query count as part of REVO-28
-    QUERY_COUNT = 33
+    QUERY_COUNT = 34
    TEST_DATA = {
        # (providers, course_width, enable_ccx, view_as_ccx): (
        #     # of sql queries to default,
@@ -271,7 +271,7 @@ class TestFieldOverrideSplitPerformance(FieldOverridePerformanceTestCase):
    __test__ = True

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

    TEST_DATA = {
        ('no_overrides', 1, True, False): (QUERY_COUNT, 3),
--- a/lms/djangoapps/course_api/blocks/tests/test_api.py
+++ b/lms/djangoapps/course_api/blocks/tests/test_api.py
@@ -220,7 +220,7 @@ class TestGetBlocksQueryCounts(TestGetBlocksQueryCountsBase):
            self._get_blocks(
                course,
                expected_mongo_queries=0,
-                expected_sql_queries=13 if with_storage_backing else 12,
+                expected_sql_queries=14 if with_storage_backing else 13,
            )

    @ddt.data(
@@ -237,9 +237,9 @@ class TestGetBlocksQueryCounts(TestGetBlocksQueryCountsBase):
            clear_course_from_cache(course.id)

            if with_storage_backing:
-                num_sql_queries = 23
+                num_sql_queries = 24
            else:
-                num_sql_queries = 13
+                num_sql_queries = 14

            self._get_blocks(
                course,
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -388,8 +388,8 @@ class IndexQueryTestCase(ModuleStoreTestCase):
    NUM_PROBLEMS = 20

    @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 10, 164),
-        (ModuleStoreEnum.Type.split, 4, 160),
+        (ModuleStoreEnum.Type.mongo, 10, 227),
+        (ModuleStoreEnum.Type.split, 4, 210),
    )
    @ddt.unpack
    def test_index_query_counts(self, store_type, expected_mongo_query_count, expected_mysql_query_count):
@@ -1597,8 +1597,8 @@ class ProgressPageTests(ProgressPageBaseTests):

    @patch.dict(settings.FEATURES, {'ASSUME_ZERO_GRADE_IF_ABSENT_FOR_ALL_TESTS': False})
    @ddt.data(
-        (False, 63, 44),
-        (True, 55, 38)
+        (False, 63, 45),
+        (True, 55, 39)
    )
    @ddt.unpack
    def test_progress_queries(self, enable_waffle, initial, subsequent):
--- a/lms/djangoapps/grades/tests/test_course_grade_factory.py
+++ b/lms/djangoapps/grades/tests/test_course_grade_factory.py
@@ -95,35 +95,35 @@ class TestCourseGradeFactory(GradeTestBase):
                self.sequence2.display_name
            ]

-        with self.assertNumQueries(3), mock_get_score(1, 2):
+        with self.assertNumQueries(5), mock_get_score(1, 2):
            _assert_read(expected_pass=False, expected_percent=0)  # start off with grade of 0

-        num_queries = 42
+        num_queries = 43
        with self.assertNumQueries(num_queries), mock_get_score(1, 2):
            grade_factory.update(self.request.user, self.course, force_update_subsections=True)

-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
            _assert_read(expected_pass=True, expected_percent=0.5)  # updated to grade of .5

-        num_queries = 6
+        num_queries = 7
        with self.assertNumQueries(num_queries), mock_get_score(1, 4):
            grade_factory.update(self.request.user, self.course, force_update_subsections=False)

-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
            _assert_read(expected_pass=True, expected_percent=0.5)  # NOT updated to grade of .25

-        num_queries = 23
+        num_queries = 24
        with self.assertNumQueries(num_queries), mock_get_score(2, 2):
            grade_factory.update(self.request.user, self.course, force_update_subsections=True)

-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
            _assert_read(expected_pass=True, expected_percent=1.0)  # updated to grade of 1.0

-        num_queries = 29
+        num_queries = 30
        with self.assertNumQueries(num_queries), mock_get_score(0, 0):  # the subsection now is worth zero
            grade_factory.update(self.request.user, self.course, force_update_subsections=True)

-        with self.assertNumQueries(3):
+        with self.assertNumQueries(4):
            _assert_read(expected_pass=False, expected_percent=0.0)  # updated to grade of 0.0

    @patch.dict(settings.FEATURES, {'ASSUME_ZERO_GRADE_IF_ABSENT_FOR_ALL_TESTS': False})
--- a/lms/djangoapps/grades/tests/test_tasks.py
+++ b/lms/djangoapps/grades/tests/test_tasks.py
@@ -162,10 +162,10 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
            assert mock_block_structure_create.call_count == 1

    @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 1, 39, True),
-        (ModuleStoreEnum.Type.mongo, 1, 39, False),
-        (ModuleStoreEnum.Type.split, 3, 39, True),
-        (ModuleStoreEnum.Type.split, 3, 39, False),
+        (ModuleStoreEnum.Type.mongo, 1, 40, True),
+        (ModuleStoreEnum.Type.mongo, 1, 40, False),
+        (ModuleStoreEnum.Type.split, 3, 40, True),
+        (ModuleStoreEnum.Type.split, 3, 40, False),
    )
    @ddt.unpack
    def test_query_counts(self, default_store, num_mongo_calls, num_sql_calls, create_multiple_subsections):
@@ -177,8 +177,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
                    self._apply_recalculate_subsection_grade()

    @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 1, 39),
-        (ModuleStoreEnum.Type.split, 3, 39),
+        (ModuleStoreEnum.Type.mongo, 1, 40),
+        (ModuleStoreEnum.Type.split, 3, 40),
    )
    @ddt.unpack
    def test_query_counts_dont_change_with_more_content(self, default_store, num_mongo_calls, num_sql_calls):
@@ -223,8 +223,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
        )

    @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 1, 22),
-        (ModuleStoreEnum.Type.split, 3, 22),
+        (ModuleStoreEnum.Type.mongo, 1, 23),
+        (ModuleStoreEnum.Type.split, 3, 23),
    )
    @ddt.unpack
    def test_persistent_grades_not_enabled_on_course(self, default_store, num_mongo_queries, num_sql_queries):
@@ -238,8 +238,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest
            assert len(PersistentSubsectionGrade.bulk_read_grades(self.user.id, self.course.id)) == 0

    @ddt.data(
-        (ModuleStoreEnum.Type.mongo, 1, 40),
-        (ModuleStoreEnum.Type.split, 3, 40),
+        (ModuleStoreEnum.Type.mongo, 1, 41),
+        (ModuleStoreEnum.Type.split, 3, 41),
    )
    @ddt.unpack
    def test_persistent_grades_enabled_on_course(self, default_store, num_mongo_queries, num_sql_queries):
--- a/openedx/core/djangoapps/schedules/tests/test_resolvers.py
+++ b/openedx/core/djangoapps/schedules/tests/test_resolvers.py
@@ -247,7 +247,7 @@ class TestCourseNextSectionUpdateResolver(SchedulesResolverTestMixin, ModuleStor
    def test_schedule_context(self):
        resolver = self.create_resolver()
        # using this to make sure the select_related stays intact
-        with self.assertNumQueries(26):
+        with self.assertNumQueries(36):
            sc = resolver.get_schedules()
            schedules = list(sc)

--- a/openedx/features/course_experience/tests/views/test_course_home.py
+++ b/openedx/features/course_experience/tests/views/test_course_home.py
@@ -205,7 +205,7 @@ class TestCourseHomePage(CourseHomePageTestCase):  # lint-amnesty, pylint: disab

        # Fetch the view and verify the query counts
        # TODO: decrease query count as part of REVO-28
-        with self.assertNumQueries(72, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(73, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
            with check_mongo_calls(4):
                url = course_home_url(self.course)
                self.client.get(url)
--- a/openedx/features/course_experience/tests/views/test_course_updates.py
+++ b/openedx/features/course_experience/tests/views/test_course_updates.py
@@ -49,7 +49,7 @@ class TestCourseUpdatesPage(BaseCourseUpdatesTestCase):

        # Fetch the view and verify that the query counts haven't changed
        # TODO: decrease query count as part of REVO-28
-        with self.assertNumQueries(50, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(53, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
            with check_mongo_calls(4):
                url = course_updates_url(self.course)
                self.client.get(url)
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -493,7 +493,7 @@ edx-toggles==4.2.0
    #   ora2
 edx-user-state-client==1.3.2
    # via -r requirements/edx/base.in
-edx-when==2.2.1
+edx-when==2.2.2
    # via
    #   -r requirements/edx/base.in
    #   edx-proctoring
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -608,7 +608,7 @@ edx-toggles==4.2.0
    #   ora2
 edx-user-state-client==1.3.2
    # via -r requirements/edx/testing.txt
-edx-when==2.2.1
+edx-when==2.2.2
    # via
    #   -r requirements/edx/testing.txt
    #   edx-proctoring
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -589,7 +589,7 @@ edx-toggles==4.2.0
    #   ora2
 edx-user-state-client==1.3.2
    # via -r requirements/edx/base.txt
-edx-when==2.2.1
+edx-when==2.2.2
    # via
    #   -r requirements/edx/base.txt
    #   edx-proctoring