diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | mediagoblin/tests/test_pdf.py | 28 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 2 | ||||
| l---------[-rw-r--r--] | mediagoblin/tests/test_submission/good.pdf | bin | 194007 -> 44 bytes |
4 files changed, 19 insertions, 12 deletions
@@ -23,6 +23,7 @@ /mediagoblin.db /celery.db /kombu.db +/celerybeat-schedule /server-log.txt *.egg/ diff --git a/mediagoblin/tests/test_pdf.py b/mediagoblin/tests/test_pdf.py index 7e59de17..7107dc9a 100644 --- a/mediagoblin/tests/test_pdf.py +++ b/mediagoblin/tests/test_pdf.py @@ -22,19 +22,25 @@ import pytest from mediagoblin.media_types.pdf.processing import ( pdf_info, check_prerequisites, create_pdf_thumb) -from .resources import GOOD_PDF as GOOD +from .resources import GOOD_PDF -@pytest.mark.skipif("not check_prerequisites()") +@pytest.mark.skipif("not os.path.exists(GOOD_PDF) or not check_prerequisites()") def test_pdf(): - good_dict = collections.OrderedDict({'pdf_version_major': 1, 'pdf_title': '', - 'pdf_page_size_width': 612, 'pdf_author': '', - 'pdf_keywords': '', 'pdf_pages': 10, - 'pdf_producer': 'dvips + GNU Ghostscript 7.05', - 'pdf_version_minor': 3, - 'pdf_creator': 'LaTeX with hyperref package', - 'pdf_page_size_height': 792}) - assert pdf_info(GOOD) == good_dict + expected_dict = {'pdf_author': -1, + 'pdf_creator': -1, + 'pdf_keywords': -1, + 'pdf_page_size_height': -1, + 'pdf_page_size_width': -1, + 'pdf_pages': -1, + 'pdf_producer': -1, + 'pdf_title': -1, + 'pdf_version_major': 1, + 'pdf_version_minor': -1} + good_info = pdf_info(GOOD_PDF) + for k, v in expected_dict.items(): + assert(k in good_info) + assert(v == -1 or v == good_info[k]) temp_dir = tempfile.mkdtemp() - create_pdf_thumb(GOOD, os.path.join(temp_dir, 'good_256_256.png'), 256, 256) + create_pdf_thumb(GOOD_PDF, os.path.join(temp_dir, 'good_256_256.png'), 256, 256) shutil.rmtree(temp_dir) diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 1c2c280e..a671d672 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -149,7 +149,7 @@ class TestSubmission: def test_normal_png(self): self.check_normal_upload(u'Normal upload 2', GOOD_PNG) - @pytest.mark.skipif("not pdf_check_prerequisites()") + @pytest.mark.skipif("not os.path.exists(GOOD_PDF) or not pdf_check_prerequisites()") def test_normal_pdf(self): response, context = self.do_post({'title': u'Normal upload 3 (pdf)'}, do_follow=True, diff --git a/mediagoblin/tests/test_submission/good.pdf b/mediagoblin/tests/test_submission/good.pdf Binary files differindex ab5db006..d7029f36 100644..120000 --- a/mediagoblin/tests/test_submission/good.pdf +++ b/mediagoblin/tests/test_submission/good.pdf |