From 92ca9e954c6278257ed10069b76710755470bab1 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Mon, 27 Nov 2017 13:41:32 -0800
Subject: [PATCH] Fix test warning/failures, hopefully

---
 test_requirements.txt | 2 +-
 tests/test_main.py    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test_requirements.txt b/test_requirements.txt
index 804589bd..a978e1de 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,4 +1,4 @@
-pytest >= 3.0
+pytest >= 3.2
 pytest-helpers-namespace
 pytest-xdist
 pytest-cov
\ No newline at end of file
diff --git a/tests/test_main.py b/tests/test_main.py
index 692477c8..1399f7a4 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -65,6 +65,7 @@ def test_quick(spoof_tesseract_cache, resources, outpdf):
     check_ocrmypdf(resources / 'ccitt.pdf', outpdf, env=spoof_tesseract_cache)
 
 
+@pytest.mark.filterwarnings('ignore:Image size')
 def test_deskew(spoof_tesseract_noop, resources, outdir):
     # Run with deskew
     deskewed_pdf = check_ocrmypdf(
@@ -1023,7 +1024,8 @@ def test_bad_locale():
 def test_qpdf_negative_zero(resources, outpdf):
     negzero = resources / 'negzero.pdf'
     hugemono = resources / 'hugemono.pdf'
-    qpdf.merge([str(negzero), str(hugemono)], outpdf)  # raises exception on err
+    # raises exception on err
+    qpdf.merge([str(negzero), str(hugemono)], outpdf, log=logging.getLogger())
     
 
 @pytest.mark.parametrize('max_files,skip', [