From 842ce8365f142ce6bb69d3a9848e638ee3221c88 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Wed, 9 Aug 2017 18:08:37 -0400 Subject: [PATCH] Fix python tests and use proctoring 1.0.0 --- lms/djangoapps/grades/tests/test_tasks.py | 16 ++++++++-------- requirements/edx/github.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lms/djangoapps/grades/tests/test_tasks.py b/lms/djangoapps/grades/tests/test_tasks.py index 005fba01cc..d27bc8206d 100644 --- a/lms/djangoapps/grades/tests/test_tasks.py +++ b/lms/djangoapps/grades/tests/test_tasks.py @@ -163,10 +163,10 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest self.assertEquals(mock_block_structure_create.call_count, 1) @ddt.data( - (ModuleStoreEnum.Type.mongo, 1, 30, True), - (ModuleStoreEnum.Type.mongo, 1, 26, False), - (ModuleStoreEnum.Type.split, 3, 30, True), - (ModuleStoreEnum.Type.split, 3, 26, False), + (ModuleStoreEnum.Type.mongo, 1, 29, True), + (ModuleStoreEnum.Type.mongo, 1, 25, False), + (ModuleStoreEnum.Type.split, 3, 29, True), + (ModuleStoreEnum.Type.split, 3, 25, False), ) @ddt.unpack def test_query_counts(self, default_store, num_mongo_calls, num_sql_calls, create_multiple_subsections): @@ -178,8 +178,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest self._apply_recalculate_subsection_grade() @ddt.data( - (ModuleStoreEnum.Type.mongo, 1, 30), - (ModuleStoreEnum.Type.split, 3, 30), + (ModuleStoreEnum.Type.mongo, 1, 29), + (ModuleStoreEnum.Type.split, 3, 29), ) @ddt.unpack def test_query_counts_dont_change_with_more_content(self, default_store, num_mongo_calls, num_sql_calls): @@ -239,8 +239,8 @@ class RecalculateSubsectionGradeTest(HasCourseWithProblemsMixin, ModuleStoreTest self.assertEqual(len(PersistentSubsectionGrade.bulk_read_grades(self.user.id, self.course.id)), 0) @ddt.data( - (ModuleStoreEnum.Type.mongo, 1, 27), - (ModuleStoreEnum.Type.split, 3, 27), + (ModuleStoreEnum.Type.mongo, 1, 26), + (ModuleStoreEnum.Type.split, 3, 26), ) @ddt.unpack def test_persistent_grades_enabled_on_course(self, default_store, num_mongo_queries, num_sql_queries): diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 422eb521d0..1c9552b41e 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -95,7 +95,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.5#egg=xblock-utils==1.0.5 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.5#egg=lti_consumer-xblock==1.1.5 -git+https://github.com/edx/edx-proctoring.git@EDUCATOR-927 +git+https://github.com/edx/edx-proctoring.git@1.0.0#egg=edx-proctoring==1.0.0 # Third Party XBlocks git+https://github.com/open-craft/xblock-poll@v1.2.7#egg=xblock-poll==1.2.7