diff options
| author | Vijeth Aradhya <vijthaaa@gmail.com> | 2017-08-29 06:06:23 +0000 |
|---|---|---|
| committer | Vijeth Aradhya <vijthaaa@gmail.com> | 2017-08-29 06:06:23 +0000 |
| commit | 0eeb2adad7e75b8969719cef14ab763810ceb66a (patch) | |
| tree | 11803d2bdf0af920f74b252791aaafbabce63475 /mediagoblin/tests/test_submission.py | |
| parent | e86e08ae741e03ff6949f9cda091318331a660bb (diff) | |
| parent | f1cdf7420223e39a8bcf67bf163a585ae98b98fa (diff) | |
| download | mediagoblin-0eeb2adad7e75b8969719cef14ab763810ceb66a.tar.lz mediagoblin-0eeb2adad7e75b8969719cef14ab763810ceb66a.tar.xz mediagoblin-0eeb2adad7e75b8969719cef14ab763810ceb66a.zip | |
Merge branch 'multiple-qualities-frontend' into 'transcoding_progress'
Minor changes
See merge request !3
Diffstat (limited to 'mediagoblin/tests/test_submission.py')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 40cd771d..f08a25f0 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -61,7 +61,7 @@ from mediagoblin.tools import template from mediagoblin.media_types.image import ImageMediaManager from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites from mediagoblin.media_types.video.processing import ( - VideoProcessingManager, main_task, complimentary_task, group, + VideoProcessingManager, main_task, complementary_task, group, processing_cleanup, CommonVideoProcessor) from mediagoblin.media_types.video.util import ACCEPTED_RESOLUTIONS from mediagoblin.submit.lib import new_upload_entry, run_process_media @@ -602,7 +602,7 @@ class TestSubmissionVideo(BaseTestSubmission): assert result[i][2] == media_file.file_path @mock.patch('mediagoblin.media_types.video.processing.processing_cleanup.signature') - @mock.patch('mediagoblin.media_types.video.processing.complimentary_task.signature') + @mock.patch('mediagoblin.media_types.video.processing.complementary_task.signature') @mock.patch('mediagoblin.media_types.video.processing.main_task.signature') def test_celery_tasks(self, mock_main_task, mock_comp_task, mock_cleanup): @@ -674,7 +674,7 @@ class TestSubmissionVideo(BaseTestSubmission): if comp_res != def_res: priority_num += -1 tasks_list.append( - complimentary_task.signature(args=(entry.id, comp_res, + complementary_task.signature(args=(entry.id, comp_res, ACCEPTED_RESOLUTIONS[comp_res]), kwargs=reprocess_info, queue='default', priority=priority_num, immutable=True) @@ -709,7 +709,7 @@ class TestSubmissionVideo(BaseTestSubmission): if comp_res != def_res: priority_num += -1 tasks_list.append( - complimentary_task.signature(args=(entry.id, comp_res, + complementary_task.signature(args=(entry.id, comp_res, ACCEPTED_RESOLUTIONS[comp_res]), kwargs=reprocess_info, queue='default', priority=priority_num, immutable=True) |