diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
| commit | 5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca (patch) | |
| tree | 7ffa78df3fbac665d32238d151fe76d07f4d995e /mediagoblin/tests | |
| parent | ac08a9acaffbafdcb99506495a192b1eaa508544 (diff) | |
| parent | 4259ad5bf1680896090290e7327b49a053a8447b (diff) | |
| download | mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.lz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.xz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.zip | |
Merge branch 'rodney757-media_plugins'
Conflicts:
mediagoblin.ini
mediagoblin/tests/test_mgoblin_app.ini
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_mgoblin_app.ini | 4 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini index 5c3c46e7..535cf1c1 100644 --- a/mediagoblin/tests/test_mgoblin_app.ini +++ b/mediagoblin/tests/test_mgoblin_app.ini @@ -13,8 +13,6 @@ tags_max_length = 50 # So we can start to test attachments: allow_attachments = True -media_types = mediagoblin.media_types.image, mediagoblin.media_types.pdf - [storage:publicstore] base_dir = %(here)s/user_dev/media/public base_url = /mgoblin_media/ @@ -34,3 +32,5 @@ BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db" [[mediagoblin.plugins.piwigo]] [[mediagoblin.plugins.basic_auth]] [[mediagoblin.plugins.openid]] +[[mediagoblin.media_types.image]] +[[mediagoblin.media_types.pdf]] diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 2ac167cb..ac941063 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -26,7 +26,7 @@ from mediagoblin.tests.tools import fixture_add_user from mediagoblin import mg_globals from mediagoblin.db.models import MediaEntry from mediagoblin.tools import template -from mediagoblin.media_types.image import MEDIA_MANAGER as img_MEDIA_MANAGER +from mediagoblin.media_types.image import ImageMediaManager from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \ @@ -219,7 +219,7 @@ class TestSubmission: media = self.check_media(request, {'title': u'Balanced Goblin'}, 1) assert media.media_type == u'mediagoblin.media_types.image' - assert isinstance(media.media_manager, img_MEDIA_MANAGER) + assert isinstance(media.media_manager, ImageMediaManager) assert media.media_manager.entry == media |