diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-21 23:38:31 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-11-21 23:38:31 +0100 |
| commit | 0bce749b21595fb0e33e2a109902b71e4611d483 (patch) | |
| tree | 6ab907bd75c76aa78c23b203ef856a9e3e635dab /mediagoblin/tests/test_submission.py | |
| parent | 8e5f974684ce4e329a5022459f2e536fa4e15edd (diff) | |
| download | mediagoblin-0bce749b21595fb0e33e2a109902b71e4611d483.tar.lz mediagoblin-0bce749b21595fb0e33e2a109902b71e4611d483.tar.xz mediagoblin-0bce749b21595fb0e33e2a109902b71e4611d483.zip | |
Fixes after merging video into master - part 2
- Added handling of InvalidFileType to submit.views
- Updated test_celery_setup and test_submission tests to reflect the changes to the
media procesing infrastructure
Diffstat (limited to 'mediagoblin/tests/test_submission.py')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index dec7118b..eea5747f 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -222,7 +222,7 @@ class TestSubmission: context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html'] form = context['submit_form'] - assert form.file.errors == ['The file doesn\'t seem to be an image!'] + assert form.file.errors == [u'Invalid file type.'] # NOTE: The following 2 tests will ultimately fail, but they # *will* pass the initial form submission step. Instead, @@ -246,7 +246,7 @@ class TestSubmission: assert_equal(entry['state'], 'failed') assert_equal( entry['fail_error'], - u'mediagoblin.process_media.errors:BadMediaFail') + u'mediagoblin.processing:BadMediaFail') # Test non-supported file with .png extension # ------------------------------------------- @@ -266,4 +266,4 @@ class TestSubmission: assert_equal(entry['state'], 'failed') assert_equal( entry['fail_error'], - u'mediagoblin.process_media.errors:BadMediaFail') + u'mediagoblin.processing:BadMediaFail') |