pdf tests: use our own pdf doc as GOOD_PDF

remove non distributable good.pdf

diff --git a/mediagoblin/tests/test_pdf.py b/mediagoblin/tests/test_pdf.py
index 7e59de17040e7e5ee3d65949042daf9f7072d4be..7107dc9a3b8379343e01d63b8a1dc6306daf9e86 100644 (file)
--- 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 1c2c280e6aa43f62bc6563614f8ff858c3db7d91..a671d672bd525a7da7bea584fc6dca9c2d6edb23 100644 (file)
--- 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
deleted file mode 100644 (file)
index ab5db00688bb9e061734d86611dc0227289632da..0000000000000000000000000000000000000000
Binary files a/mediagoblin/tests/test_submission/good.pdf and /dev/null differ

diff --git a/mediagoblin/tests/test_submission/good.pdf b/mediagoblin/tests/test_submission/good.pdf
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..d7029f3688ec28cc9fc5c22ce02e6582b3d71131
--- /dev/null
+++ b/mediagoblin/tests/test_submission/good.pdf
@@ -0,0 +1 @@
+../../../docs/build/latex/GNUMediaGoblin.pdf
\ No newline at end of file