heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes after merging video into master - part 2

Browse Source 
- Added handling of InvalidFileType to submit.views
- Updated test_celery_setup and test_submission tests to reflect the changes to the
  media procesing infrastructure
This commit is contained in:
Joar Wandborg 2011-11-21 23:38:31 +01:00
parent 8e5f974684
commit 0bce749b21
3 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/submit/views.py
View File

@ -31,7 +31,7 @@ from mediagoblin.decorators import require_active_login
from mediagoblin.submit import forms as submit_forms, security from mediagoblin.submit import forms as submit_forms, security
from mediagoblin.processing import mark_entry_failed, ProcessMedia from mediagoblin.processing import mark_entry_failed, ProcessMedia
from mediagoblin.messages import add_message, SUCCESS from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.media_types import get_media_type_and_manager from mediagoblin.media_types import get_media_type_and_manager, InvalidFileType
@require_active_login @require_active_login
@ -48,8 +48,8 @@ def submit_start(request):
submit_form.file.errors.append( submit_form.file.errors.append(
_(u'You must provide a file.')) _(u'You must provide a file.'))
else: else:
try:
filename = request.POST['file'].filename filename = request.POST['file'].filename
media_type, media_manager = get_media_type_and_manager(filename) media_type, media_manager = get_media_type_and_manager(filename)
# create entry and save in database # create entry and save in database
@ -128,6 +128,9 @@ def submit_start(request):
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",
user=request.user['username']) user=request.user['username'])
except InvalidFileType, exc:
submit_form.file.errors.append(
_(u'Invalid file type.'))
return render_to_response( return render_to_response(
request, request,

4
mediagoblin/tests/test_celery_setup.py
View File

@ -50,7 +50,7 @@ def test_setup_celery_from_config():
assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float) assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
assert fake_celery_module.CELERY_RESULT_PERSISTENT is True assert fake_celery_module.CELERY_RESULT_PERSISTENT is True
assert fake_celery_module.CELERY_IMPORTS == [ assert fake_celery_module.CELERY_IMPORTS == [
'foo.bar.baz', 'this.is.an.import', 'mediagoblin.process_media'] 'foo.bar.baz', 'this.is.an.import', 'mediagoblin.processing']
assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == { assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
'database': 'mediagoblin'} 'database': 'mediagoblin'}
assert fake_celery_module.CELERY_RESULT_BACKEND == 'mongodb' assert fake_celery_module.CELERY_RESULT_BACKEND == 'mongodb'
@ -74,7 +74,7 @@ def test_setup_celery_from_config():
assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float) assert isinstance(fake_celery_module.CELERYD_ETA_SCHEDULER_PRECISION, float)
assert fake_celery_module.CELERY_RESULT_PERSISTENT is False assert fake_celery_module.CELERY_RESULT_PERSISTENT is False
assert fake_celery_module.CELERY_IMPORTS == [ assert fake_celery_module.CELERY_IMPORTS == [
'baz.bar.foo', 'import.is.a.this', 'mediagoblin.process_media'] 'baz.bar.foo', 'import.is.a.this', 'mediagoblin.processing']
assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == { assert fake_celery_module.CELERY_MONGODB_BACKEND_SETTINGS == {
'database': 'captain_lollerskates', 'database': 'captain_lollerskates',
'host': 'mongodb.example.org', 'host': 'mongodb.example.org',

6
mediagoblin/tests/test_submission.py
View File

@ -222,7 +222,7 @@ class TestSubmission:
context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html'] context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html']
form = context['submit_form'] 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 # NOTE: The following 2 tests will ultimately fail, but they
# *will* pass the initial form submission step. Instead, # *will* pass the initial form submission step. Instead,
@ -246,7 +246,7 @@ class TestSubmission:
assert_equal(entry['state'], 'failed') assert_equal(entry['state'], 'failed')
assert_equal( assert_equal(
entry['fail_error'], entry['fail_error'],
u'mediagoblin.process_media.errors:BadMediaFail') u'mediagoblin.processing:BadMediaFail')
# Test non-supported file with .png extension # Test non-supported file with .png extension
# ------------------------------------------- # -------------------------------------------
@ -266,4 +266,4 @@ class TestSubmission:
assert_equal(entry['state'], 'failed') assert_equal(entry['state'], 'failed')
assert_equal( assert_equal(
entry['fail_error'], entry['fail_error'],
u'mediagoblin.process_media.errors:BadMediaFail') u'mediagoblin.processing:BadMediaFail')