Merge branch 'feature/fix-raster-dpi-too-high' into v15

tests/plugins/gs_feature_elision.py

@@ -20,14 +20,14 @@ def run_append_stderr(*args, **kwargs):
 
 
 @hookimpl
-def generate_pdfa(pdf_pages, pdfmark, output_file, compression, pdf_version, pdfa_part):
+def generate_pdfa(pdf_pages, pdfmark, output_file, context, pdf_version, pdfa_part):
     with patch('ocrmypdf._exec.ghostscript.run_polling_stderr') as mock:
         mock.side_effect = run_append_stderr
         ghostscript.generate_pdfa(
             pdf_pages=pdf_pages,
             pdfmark=pdfmark,
             output_file=output_file,
-            compression=compression,
+            context=context,
             pdf_version=pdf_version,
             pdfa_part=pdfa_part,
             progressbar_class=None,

tests/plugins/gs_pdfa_failure.py

@@ -22,14 +22,14 @@ def run_rig_args(args, **kwargs):
 
 
 @hookimpl
-def generate_pdfa(pdf_pages, pdfmark, output_file, compression, pdf_version, pdfa_part):
+def generate_pdfa(pdf_pages, pdfmark, output_file, context, pdf_version, pdfa_part):
     with patch('ocrmypdf._exec.ghostscript.run_polling_stderr') as mock:
         mock.side_effect = run_rig_args
         ghostscript.generate_pdfa(
             pdf_pages=pdf_pages,
             pdfmark=pdfmark,
             output_file=output_file,
-            compression=compression,
+            context=context,
             pdf_version=pdf_version,
             pdfa_part=pdfa_part,
             progressbar_class=None,

tests/plugins/gs_render_failure.py

@@ -17,14 +17,14 @@ def raise_gs_fail(*args, **kwargs):
 
 
 @hookimpl
-def generate_pdfa(pdf_pages, pdfmark, output_file, compression, pdf_version, pdfa_part):
+def generate_pdfa(pdf_pages, pdfmark, output_file, context, pdf_version, pdfa_part):
     with patch('ocrmypdf._exec.ghostscript.run_polling_stderr') as mock:
         mock.side_effect = raise_gs_fail
         ghostscript.generate_pdfa(
             pdf_pages=pdf_pages,
             pdfmark=pdfmark,
             output_file=output_file,
-            compression=compression,
+            context=context,
             pdf_version=pdf_version,
             pdfa_part=pdfa_part,
             progressbar_class=None,

tests/plugins/gs_render_soft_error.py

@@ -23,7 +23,7 @@ def generate_pdfa(
     pdf_pages,
     pdfmark,
     output_file,
-    compression,
+    context,
     pdf_version,
     pdfa_part,
     stop_on_soft_error,
@@ -34,7 +34,7 @@ def generate_pdfa(
             pdf_pages=pdf_pages,
             pdfmark=pdfmark,
             output_file=output_file,
-            compression=compression,
+            context=context,
             pdf_version=pdf_version,
             pdfa_part=pdfa_part,
             progressbar_class=None,

tests/test_metadata.py

@@ -86,7 +86,8 @@ def test_unset_metadata(output_type, field, resources, outpdf):
         'title': b'NFY5f7Ft2DWMkxLhXwxvFf7eWR2KeK3vEDcd',
         'author': b'yXaryipxyRk9dVjWjSSaVaNCKeLRgEVzPRMp',
         'subject': b't49vimctvnuH7ZeAjAkv52ACvWFjcnm5MPJr',
-        'keywords': b's9EeALwUg7urA7fnnhm5EtUyC54sW2WPUzqh'}
+        'keywords': b's9EeALwUg7urA7fnnhm5EtUyC54sW2WPUzqh',
+    }
 
     p = run_ocrmypdf(
         input_file,
@@ -352,17 +353,24 @@ XMP_MAGIC = b'W5M0MpCehiHzreSzNTczkc9d'
 
 def test_prevent_gs_invalid_xml(resources, outdir):
     generate_pdfa_ps(outdir / 'pdfa.ps')
-    copyfile(resources / 'trivial.pdf', outdir / 'layers.rendered.pdf')
 
     # Inject a string with a trailing nul character into the DocumentInfo
     # dictionary of this PDF, as often occurs in practice.
-    with pikepdf.open(outdir / 'layers.rendered.pdf') as pike:
+    with pikepdf.open(resources / 'trivial.pdf') as pike:
         pike.Root.DocumentInfo = pikepdf.Dictionary(
             Title=b'String with trailing nul\x00'
         )
+        pike.save(outdir / 'layers.rendered.pdf', fix_metadata_version=False)
 
-    options = get_parser().parse_args(
-        args=['-j', '1', '--output-type', 'pdfa-2', 'a.pdf', 'b.pdf']
+    _, options, _ = get_parser_options_plugins(
+        args=[
+            '-j',
+            '1',
+            '--output-type',
+            'pdfa-2',
+            'a.pdf',
+            'b.pdf',
+        ]
     )
     pdfinfo = PdfInfo(outdir / 'layers.rendered.pdf')
     context = PdfContext(
@@ -387,17 +395,15 @@ def test_prevent_gs_invalid_xml(resources, outdir):
 
 def test_malformed_docinfo(caplog, resources, outdir):
     generate_pdfa_ps(outdir / 'pdfa.ps')
-    # copyfile(resources / 'trivial.pdf', outdir / 'layers.rendered.pdf')
 
     with pikepdf.open(resources / 'trivial.pdf') as pike:
         pike.trailer.Info = pikepdf.Stream(pike, b"<xml></xml>")
         pike.save(outdir / 'layers.rendered.pdf', fix_metadata_version=False)
 
-    options = get_parser().parse_args(
+    _, options, _ = get_parser_options_plugins(
         args=[
             '-j',
             '1',
-            '--continue-on-soft-render-error',
             '--output-type',
             'pdfa-2',
             'a.pdf',