Fix some test failures missed in prev commit

tests/test_main.py

@@ -576,8 +576,6 @@ def test_stdout(spoof_tesseract_noop, ocrmypdf_exec, resources, outpdf):
             stdin=DEVNULL,
             env=spoof_tesseract_noop,
         )
-        out, err = p.communicate()
-
         assert p.returncode == ExitCode.ok
 
     assert qpdf.check(output_file, log=None)
@@ -857,7 +855,7 @@ def test_compression_preserved(
 
         if im.mode in ('RGBA', 'LA'):
             # If alpha image is input, expect an error
-            assert p.returncode != ExitCode.ok and b'alpha' in p.stderr
+            assert p.returncode != ExitCode.ok and 'alpha' in p.stderr
             return
 
         assert p.returncode == ExitCode.ok, p.stderr

tests/test_tess4.py

@@ -120,7 +120,7 @@ def test_pagesize_consistency_tess4(ensure_tess4, resources, outpdf):
         '--clean' if pytest.helpers.have_unpaper() else None,
         '--deskew',
         '--remove-background',
-        '--clean-final',
+        '--clean-final' if pytest.helpers.have_unpaper() else None,
         env=ensure_tess4,
     )
 

tests/test_userunit.py

@@ -20,6 +20,7 @@ from math import isclose
 import pytest
 
 from ocrmypdf.exceptions import ExitCode
+from ocrmypdf.pdfinfo import PdfInfo
 
 check_ocrmypdf = pytest.helpers.check_ocrmypdf
 run_ocrmypdf = pytest.helpers.run_ocrmypdf