diff options
| -rw-r--r-- | mediagoblin/tests/test_pdf.py | 5 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mediagoblin/tests/test_pdf.py b/mediagoblin/tests/test_pdf.py index a3979a25..b8c21bdb 100644 --- a/mediagoblin/tests/test_pdf.py +++ b/mediagoblin/tests/test_pdf.py @@ -17,16 +17,15 @@ import tempfile import shutil import os - +import pytest from mediagoblin.media_types.pdf.processing import ( pdf_info, check_prerequisites, create_pdf_thumb) GOOD='mediagoblin/tests/test_submission/good.pdf' +@pytest.mark.skipif("not check_prerequisites()") def test_pdf(): - if not check_prerequisites(): - return good_dict = {'pdf_version_major': 1, 'pdf_title': '', 'pdf_page_size_width': 612, 'pdf_author': '', 'pdf_keywords': '', 'pdf_pages': 10, diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 462a1653..7c9b3115 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -20,6 +20,7 @@ sys.setdefaultencoding('utf-8') import urlparse import os +import pytest from pkg_resources import resource_filename @@ -128,9 +129,8 @@ class TestSubmission: self._setup(test_app) self.check_normal_upload(u'Normal upload 2', GOOD_PNG) + @pytest.mark.skipif("not pdf_check_prerequisites()") def test_normal_pdf(self, test_app): - if not pdf_check_prerequisites(): - return self._setup(test_app) response, context = self.do_post({'title': u'Normal upload 3 (pdf)'}, do_follow=True, |