]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Configure ImageMagick on the runner to allow more tests to run by default 2570/head
authorTrenton H <797416+stumpylog@users.noreply.github.com>
Tue, 31 Jan 2023 22:26:04 +0000 (14:26 -0800)
committerTrenton H <797416+stumpylog@users.noreply.github.com>
Tue, 31 Jan 2023 22:37:56 +0000 (14:37 -0800)
.github/workflows/ci.yml
src/paperless_mail/tests/test_parsers_live.py

index adf03d4bb6fed228f964d29f5e3ef969f028c11c..68eb89a30ac4f46d6e611df5cff541ddc5f71f67 100644 (file)
@@ -113,8 +113,6 @@ jobs:
       PAPERLESS_MAIL_TEST_HOST: ${{ secrets.TEST_MAIL_HOST }}
       PAPERLESS_MAIL_TEST_USER: ${{ secrets.TEST_MAIL_USER }}
       PAPERLESS_MAIL_TEST_PASSWD: ${{ secrets.TEST_MAIL_PASSWD }}
-      # Skip Tests which require convert
-      PAPERLESS_TEST_SKIP_CONVERT: 1
       # Enable Gotenberg end to end testing
       GOTENBERG_LIVE: 1
     steps:
@@ -145,6 +143,10 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript libzbar0 poppler-utils
+      -
+        name: Configure ImageMagick
+        run: |
+          sudo cp docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml
       -
         name: Install Python dependencies
         run: |
index 7ea56d7e4fa90aa4dd3ebd40e5a1d2ebe9615e0b..90c172d07d747734641b8dcde5a03545f6e79cf0 100644 (file)
@@ -67,11 +67,6 @@ class TestParserLive(TestCase):
 
         return result
 
-    # Only run if convert is available
-    @pytest.mark.skipif(
-        "PAPERLESS_TEST_SKIP_CONVERT" in os.environ,
-        reason="PAPERLESS_TEST_SKIP_CONVERT set, skipping Test",
-    )
     @mock.patch("paperless_mail.parsers.MailDocumentParser.generate_pdf")
     def test_get_thumbnail(self, mock_generate_pdf: mock.MagicMock):
         """
@@ -204,11 +199,6 @@ class TestParserLive(TestCase):
         "GOTENBERG_LIVE" not in os.environ,
         reason="No gotenberg server",
     )
-    # Only run if convert is available
-    @pytest.mark.skipif(
-        "PAPERLESS_TEST_SKIP_CONVERT" in os.environ,
-        reason="PAPERLESS_TEST_SKIP_CONVERT set, skipping Test",
-    )
     def test_generate_pdf_from_mail(self):
         """
         GIVEN:
@@ -301,11 +291,6 @@ class TestParserLive(TestCase):
         "GOTENBERG_LIVE" not in os.environ,
         reason="No gotenberg server",
     )
-    # Only run if convert is available
-    @pytest.mark.skipif(
-        "PAPERLESS_TEST_SKIP_CONVERT" in os.environ,
-        reason="PAPERLESS_TEST_SKIP_CONVERT set, skipping Test",
-    )
     def test_generate_pdf_from_html(self):
         """
         GIVEN: