Skip to content

Commit 6ad5283

Browse files
test: fix tests after adding 'transaction.on_commit' running task
1 parent 270b825 commit 6ad5283

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

cms/djangoapps/import_from_modulestore/tests/test_api.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from common.djangoapps.student.tests.factories import UserFactory
1111
from cms.djangoapps.import_from_modulestore.api import create_import, import_course_staged_content_to_library
12+
from cms.djangoapps.import_from_modulestore.data import ImportStatus
1213
from cms.djangoapps.import_from_modulestore.models import Import
1314
from openedx.core.djangoapps.content_libraries.tests import factories
1415
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -32,18 +33,13 @@ def test_create_import(self):
3233
"""
3334
course_id = "course-v1:edX+DemoX+Demo_Course"
3435
user = UserFactory()
35-
with patch(
36-
"cms.djangoapps.import_from_modulestore.api.save_legacy_content_to_staged_content_task"
37-
) as save_legacy_content_to_staged_content_task_mock:
38-
create_import(course_id, user.id, self.library.learning_package_id)
36+
create_import(course_id, user.id, self.library.learning_package_id)
3937

4038
import_event = Import.objects.get()
4139
assert import_event.source_key == CourseKey.from_string(course_id)
4240
assert import_event.target == self.library.learning_package
4341
assert import_event.user_id == user.id
44-
save_legacy_content_to_staged_content_task_mock.apply_async.assert_called_once_with(
45-
kwargs={'import_uuid': import_event.uuid}
46-
)
42+
assert import_event.status == ImportStatus.PENDING
4743

4844
def test_import_course_staged_content_to_library(self):
4945
"""

cms/djangoapps/import_from_modulestore/tests/test_helpers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ def setUp(self):
4747
display_name='Video',
4848
data="""<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>""",
4949
)
50-
51-
self.import_event = api.create_import(
52-
source_key=self.course.id,
53-
learning_package_id=self.library.learning_package.id,
54-
user_id=self.user.id,
55-
)
50+
with self.captureOnCommitCallbacks(execute=True):
51+
self.import_event = api.create_import(
52+
source_key=self.course.id,
53+
learning_package_id=self.library.learning_package.id,
54+
user_id=self.user.id,
55+
)
5656
self.parser = etree.XMLParser(strip_cdata=False)
5757

5858
def test_import_from_staged_content(self):

cms/djangoapps/import_from_modulestore/views/v0/tests/test_views.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ def setUp(self):
4444
self.vertical = BlockFactory.create(category='vertical', parent=self.sequential)
4545
self.problem = BlockFactory.create(category='problem', parent=self.vertical)
4646

47-
self.import_event = api.create_import(
48-
user_id=self.admin_user.pk,
49-
learning_package_id=self.library.learning_package.id,
50-
source_key=self.course.id,
51-
)
47+
with self.captureOnCommitCallbacks(execute=True):
48+
self.import_event = api.create_import(
49+
user_id=self.admin_user.pk,
50+
learning_package_id=self.library.learning_package.id,
51+
source_key=self.course.id,
52+
)
5253

5354

5455
class ImportBlocksViewTest(TestCourseToLibraryImportViewsMixin):

0 commit comments

Comments
 (0)