From e99c4c4d3a6460d7493c055a82c8ce4eae5e1f0f Mon Sep 17 00:00:00 2001 From: "J. Cliff Dyer" Date: Thu, 21 Sep 2017 11:33:11 -0400 Subject: [PATCH 1/2] Bump problem-builder requirement to 2.7.7. --- requirements/edx/edx-private.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index 108df1ecbb..1983d8bb55 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -8,7 +8,7 @@ # For Harvard courses: -e git+https://github.com/gsehub/xblock-mentoring.git@4d1cce78dc232d5da6ffd73817b5c490e87a6eee#egg=xblock-mentoring -git+https://github.com/open-craft/problem-builder.git@v2.7.6#egg=xblock-problem-builder==2.7.6 +git+https://github.com/open-craft/problem-builder.git@v2.7.7#egg=xblock-problem-builder==2.7.7 # Oppia XBlock -e git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock From c1150578b74a189330ca366055056f2e37191197 Mon Sep 17 00:00:00 2001 From: "J. Cliff Dyer" Date: Thu, 21 Sep 2017 12:20:25 -0400 Subject: [PATCH 2/2] Fix flaky test: https://build.testeng.edx.org/job/edx-platform-python-unittests-pr/41000/testReport/openedx.core.djangoapps.content.course_overviews.management.commands.tests.test_generate_course_overview/TestGenerateCourseOverview/test_routing_key_2/ --- .../management/commands/tests/test_generate_course_overview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py index 15ab37a575..6251aa6b67 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py @@ -106,7 +106,7 @@ class TestGenerateCourseOverview(ModuleStoreTestCase): self.command.handle(all_courses=True, force_update=True, routing_key='my-routing-key', chunk_size=10000) called_kwargs = mock_async_task.apply_async.call_args_list[0][1] - self.assertEquals(sorted([unicode(self.course_key_1), unicode(self.course_key_2)]), called_kwargs.pop('args')) + self.assertEquals(sorted([unicode(self.course_key_1), unicode(self.course_key_2)]), sorted(called_kwargs.pop('args'))) self.assertEquals({ 'kwargs': {'force_update': True}, 'routing_key': 'my-routing-key'