Fix typos

[notmuch] / bindings / python-cffi / tests / conftest.py

diff --git a/bindings/python-cffi/tests/conftest.py b/bindings/python-cffi/tests/conftest.py
index 1b7bbc35ddb98803de1f766ecc894a73941201fc..6835fd30f723509cd6235540d35deadfc838cfa7 100644 (file)
--- a/bindings/python-cffi/tests/conftest.py
+++ b/bindings/python-cffi/tests/conftest.py
@@ -1,14 +1,22 @@
 import email.message
 import mailbox
 import pathlib
+import shutil
 import socket
 import subprocess
 import textwrap
 import time
+import os
 
 import pytest
 
 
+def pytest_report_header():
+    which = shutil.which('notmuch')
+    vers = subprocess.run(['notmuch', '--version'], stdout=subprocess.PIPE)
+    return ['{} ({})'.format(vers.stdout.decode(errors='replace').strip(),which)]
+
+
 @pytest.fixture(scope='function')
 def tmppath(tmpdir):
     """The tmpdir fixture wrapped in pathlib.Path."""
@@ -23,7 +31,7 @@ def notmuch(maildir):
     fixture.
     """
     def run(*args):
-        """Run a notmuch comand.
+        """Run a notmuch command.
 
         This function runs with a timeout error as many notmuch
         commands may block if multiple processes are trying to open
@@ -32,10 +40,11 @@ def notmuch(maildir):
         """
         cfg_fname = maildir.path / 'notmuch-config'
         cmd = ['notmuch'] + list(args)
-        print('Invoking: {}'.format(' '.join(cmd)))
+        env = os.environ.copy()
+        env['NOTMUCH_CONFIG'] = str(cfg_fname)
         proc = subprocess.run(cmd,
                               timeout=5,
-                              env={'NOTMUCH_CONFIG': str(cfg_fname)})
+                              env=env)
         proc.check_returncode()
     return run
 
@@ -69,8 +78,6 @@ def maildir(tmppath):
             exclude_tags=deleted;spam;
             [maildir]
             synchronize_flags=true
-            [crypto]
-            gpg_path=gpg
             """.format(tmppath=tmppath)))
     return MailDir(tmppath)