diff options
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 9 | ||||
| -rw-r--r-- | mediagoblin/tests/test_video.py | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index f08a25f0..a7661e85 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -47,7 +47,10 @@ import os import pytest import webtest.forms import pkg_resources -import mock +try: + import mock +except ImportError: + import unittest.mock as mock import six.moves.urllib.parse as urlparse @@ -635,7 +638,7 @@ class TestSubmissionVideo(BaseTestSubmission): manager.workflow(entry, feed_url=None, reprocess_action='initial') # test section - mock_main_task.assert_called_once_with(args=(entry.id, def_res, + mock_main_task.assert_called_once_with(args=(entry.id, def_res, ACCEPTED_RESOLUTIONS[def_res]), kwargs=reprocess_info, queue='default', priority=main_priority, immutable=True) @@ -724,7 +727,7 @@ class TestSubmissionVideo(BaseTestSubmission): manager = VideoProcessingManager() processor = CommonVideoProcessor(manager, entry) acceptable_files = ['original, best_quality', 'webm_144p', 'webm_360p', - 'webm_480p', 'webm_720p', 'webm_1080p', 'webm_video'] + 'webm_480p', 'webm_720p', 'webm_1080p', 'webm_video'] assert processor.acceptable_files == acceptable_files diff --git a/mediagoblin/tests/test_video.py b/mediagoblin/tests/test_video.py index 0f477bfe..89949332 100644 --- a/mediagoblin/tests/test_video.py +++ b/mediagoblin/tests/test_video.py @@ -32,6 +32,7 @@ from mediagoblin.media_types.video.transcoders import (capture_thumb, VideoTranscoder) from mediagoblin.media_types.video.util import ACCEPTED_RESOLUTIONS from mediagoblin.media_types.tools import discover +from mediagoblin.tests.tools import get_app @contextmanager def create_data(suffix=None, make_audio=False): @@ -115,6 +116,7 @@ def test_transcoder(): transcoder = VideoTranscoder() transcoder.transcode( video_name, result_name, + '480p', 1, vp8_quality=8, vp8_threads=0, # autodetect vorbis_quality=0.3, @@ -125,6 +127,7 @@ def test_transcoder(): transcoder = VideoTranscoder() transcoder.transcode( video_name, result_name, + '480p', 1, vp8_quality=8, vp8_threads=0, # autodetect vorbis_quality=0.3, |