From 5ad7550a9129de60b5b57a60055c781611119d67 Mon Sep 17 00:00:00 2001 From: Angelos Evripiotis Date: Mon, 28 Oct 2019 15:44:51 +0000 Subject: tests/artifactshare: safer cleanup_on_sigterm use Use the documented path [1] to `pytest_cov.embed.cleanup_on_sigterm()`, to avoid crashing on some versions. It turns out that pytest_cov v2.6.1 on my machine doesn't like the way that we were accessing cleanup_on_sigterm(). Access it in such a way that we will either get the function or an ImportError, as per the documentation. [1]: https://pytest-cov.readthedocs.io/en/latest/subprocess-support.html --- tests/testutils/artifactshare.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutils/artifactshare.py b/tests/testutils/artifactshare.py index 7a4eda1be..e49531d1b 100644 --- a/tests/testutils/artifactshare.py +++ b/tests/testutils/artifactshare.py @@ -162,11 +162,11 @@ def _start_artifact_server(queue, repodir, quota, index_only): signal.signal(signal.SIGTERM, lambda signalnum, frame: sys.exit(0)) try: - import pytest_cov + from pytest_cov.embed import cleanup_on_sigterm except ImportError: pass else: - pytest_cov.embed.cleanup_on_sigterm() + cleanup_on_sigterm() server = stack.enter_context( create_server( -- cgit v1.2.1