From e8cb7c7f60c86cb70df904c624e3f636cb6a0041 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Nov 2019 09:10:29 -0400 Subject: [PATCH] bindings/python-cffi: preserve environment for tests We'll need this e.g. to pass PATH to the pytest tests Based on the suggested approach in id:87d0eljggj.fsf@powell.devork.be --- bindings/python-cffi/tests/conftest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bindings/python-cffi/tests/conftest.py b/bindings/python-cffi/tests/conftest.py index 1b7bbc35..aa940947 100644 --- a/bindings/python-cffi/tests/conftest.py +++ b/bindings/python-cffi/tests/conftest.py @@ -5,6 +5,7 @@ import socket import subprocess import textwrap import time +import os import pytest @@ -32,10 +33,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