tests: replace many run_ocrmypdf -> run_ocrmypdf_api

tests/test_ghostscript.py

@@ -16,7 +16,7 @@ from ocrmypdf._exec.ghostscript import DuplicateFilter, rasterize_pdf
 from ocrmypdf.exceptions import ExitCode
 from ocrmypdf.helpers import Resolution
 
-from .conftest import check_ocrmypdf, run_ocrmypdf
+from .conftest import check_ocrmypdf, run_ocrmypdf_api
 
 # pylint: disable=redefined-outer-name
 
@@ -75,8 +75,8 @@ def test_rasterize_rotated(francais, outdir, caplog):
         assert im.info['dpi'] == forced_dpi.flip_axis()
 
 
-def test_gs_render_failure(resources, outpdf):
-    p = run_ocrmypdf(
+def test_gs_render_failure(resources, outpdf, caplog):
+    exitcode = run_ocrmypdf_api(
         resources / 'blank.pdf',
         outpdf,
         '--plugin',
@@ -84,12 +84,12 @@ def test_gs_render_failure(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_render_failure.py',
     )
-    assert 'TEST ERROR: gs_render_failure.py' in p.stderr
-    assert p.returncode == ExitCode.child_process_error
+    assert 'TEST ERROR: gs_render_failure.py' in caplog.text
+    assert exitcode == ExitCode.child_process_error
 
 
-def test_gs_raster_failure(resources, outpdf):
-    p = run_ocrmypdf(
+def test_gs_raster_failure(resources, outpdf, caplog):
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--plugin',
@@ -97,12 +97,12 @@ def test_gs_raster_failure(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_raster_failure.py',
     )
-    assert 'TEST ERROR: gs_raster_failure.py' in p.stderr
-    assert p.returncode == ExitCode.child_process_error
+    assert 'TEST ERROR: gs_raster_failure.py' in caplog.text
+    assert exitcode == ExitCode.child_process_error
 
 
-def test_ghostscript_pdfa_failure(resources, outpdf):
-    p = run_ocrmypdf(
+def test_ghostscript_pdfa_failure(resources, outpdf, caplog):
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--plugin',
@@ -111,7 +111,7 @@ def test_ghostscript_pdfa_failure(resources, outpdf):
         'tests/plugins/gs_pdfa_failure.py',
     )
     assert (
-        p.returncode == ExitCode.pdfa_conversion_failed
+        exitcode == ExitCode.pdfa_conversion_failed
     ), "Unexpected return when PDF/A fails"
 
 

tests/test_main.py

@@ -201,14 +201,14 @@ def test_force_ocr_on_pdf_with_no_images(resources, no_outpdf):
     # As a correctness test, make sure that --force-ocr on a PDF with no
     # content still triggers tesseract. If tesseract crashes, then it was
     # called.
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         resources / 'blank.pdf',
         no_outpdf,
         '--force-ocr',
         '--plugin',
         'tests/plugins/tesseract_crash.py',
     )
-    assert p.returncode == ExitCode.child_process_error
+    assert exitcode == ExitCode.child_process_error
     assert not no_outpdf.exists()
 
 

tests/test_rotation.py

@@ -19,7 +19,7 @@ from ocrmypdf._plugin_manager import get_plugin_manager
 from ocrmypdf.helpers import IMG2PDF_KWARGS, Resolution
 from ocrmypdf.pdfinfo import PdfInfo
 
-from .conftest import check_ocrmypdf, run_ocrmypdf
+from .conftest import check_ocrmypdf, run_ocrmypdf_api
 
 # pylintx: disable=unused-variable
 
@@ -213,7 +213,7 @@ def test_rotate_deskew_ocr_timeout(resources, outdir):
 @pytest.mark.slow
 @pytest.mark.parametrize('page_angle', (0, 90, 180, 270))
 @pytest.mark.parametrize('image_angle', (0, 90, 180, 270))
-def test_rotate_page_level(image_angle, page_angle, resources, outdir):
+def test_rotate_page_level(image_angle, page_angle, resources, outdir, caplog):
     def make_rotate_test(prefix, image_angle, page_angle):
         memimg = BytesIO()
         with Image.open(fspath(resources / 'typewriter.png')) as im:
@@ -240,17 +240,15 @@ def test_rotate_page_level(image_angle, page_angle, resources, outdir):
     test = make_rotate_test('test', image_angle, page_angle)
     out = test.with_suffix('.out.pdf')
 
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         test,
         out,
         '-O0',
         '--rotate-pages',
         '--rotate-pages-threshold',
         '0.001',
-        text=False,
     )
-    err = p.stderr.decode('utf-8', errors='replace')
-    assert p.returncode == 0, err
+    assert exitcode == 0, caplog.text
 
     assert compare_images_monochrome(outdir, reference, 1, out, 1) > 0.2
 

tests/test_soft_error.py

@@ -9,11 +9,11 @@ import pytest
 
 from ocrmypdf.exceptions import ExitCode
 
-from .conftest import run_ocrmypdf
+from .conftest import run_ocrmypdf_api
 
 
 def test_raster_continue_on_soft_error(resources, outpdf):
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--continue-on-soft-render-error',
@@ -22,11 +22,11 @@ def test_raster_continue_on_soft_error(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_raster_soft_error.py',
     )
-    assert p.returncode == ExitCode.ok
+    assert exitcode == ExitCode.ok
 
 
 def test_raster_stop_on_soft_error(resources, outpdf):
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--plugin',
@@ -34,11 +34,11 @@ def test_raster_stop_on_soft_error(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_raster_soft_error.py',
     )
-    assert p.returncode == ExitCode.child_process_error
+    assert exitcode == ExitCode.child_process_error
 
 
 def test_render_continue_on_soft_error(resources, outpdf):
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--continue-on-soft-render-error',
@@ -47,12 +47,12 @@ def test_render_continue_on_soft_error(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_render_soft_error.py',
     )
-    assert p.returncode == ExitCode.ok
+    assert exitcode == ExitCode.ok
 
 
 @pytest.mark.skipif(os.name == 'nt', reason='Ghostscript on Windows errors out')
 def test_render_stop_on_soft_error(resources, outpdf):
-    p = run_ocrmypdf(
+    exitcode = run_ocrmypdf_api(
         resources / 'francais.pdf',
         outpdf,
         '--plugin',
@@ -60,4 +60,4 @@ def test_render_stop_on_soft_error(resources, outpdf):
         '--plugin',
         'tests/plugins/gs_render_soft_error.py',
     )
-    assert p.returncode == ExitCode.child_process_error
+    assert exitcode == ExitCode.child_process_error