diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-04-16 00:33:38 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-04-17 01:15:46 +0200 |
| commit | b698c94d035ec0ac5a5f695babf6f84c354510f5 (patch) | |
| tree | afc95c3dd13e2c89b1e900a021171d9b8b2b7dcd /mediagoblin/tests/test_api.py | |
| parent | 54b3113abc464f1401cda60b236e134935649f9a (diff) | |
| download | mediagoblin-b698c94d035ec0ac5a5f695babf6f84c354510f5.tar.lz mediagoblin-b698c94d035ec0ac5a5f695babf6f84c354510f5.tar.xz mediagoblin-b698c94d035ec0ac5a5f695babf6f84c354510f5.zip | |
Refactor test resources into new resources.py
Diffstat (limited to 'mediagoblin/tests/test_api.py')
| -rw-r--r-- | mediagoblin/tests/test_api.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index cff25776..89cf1026 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -18,31 +18,17 @@ import logging import base64 -from pkg_resources import resource_filename - import pytest from mediagoblin import mg_globals from mediagoblin.tools import template, pluginapi from mediagoblin.tests.tools import fixture_add_user +from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \ + BIG_BLUE _log = logging.getLogger(__name__) -def resource(filename): - ''' - Borrowed from the submission tests - ''' - return resource_filename('mediagoblin.tests', 'test_submission/' + filename) - - -GOOD_JPG = resource('good.jpg') -GOOD_PNG = resource('good.png') -EVIL_FILE = resource('evil') -EVIL_JPG = resource('evil.jpg') -EVIL_PNG = resource('evil.png') -BIG_BLUE = resource('bigblue.png') - class TestAPI(object): def setup(self): |