Skip to content

Commit 26663e4

Browse files
Wrap uses of pytest_cov.embed in try-except
This handles any version of pytest_cov. Eventually once Python <=3.8 support is dropped we can completely remove this workaround (assuming coverage all works as expected on those versions)
1 parent 8480032 commit 26663e4

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def enable_code_coverage():
134134
try:
135135
from pytest_cov.embed import cleanup_on_sigterm
136136
except ImportError:
137-
pass
137+
pass # Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
138138
else:
139139
cleanup_on_sigterm()
140140

tests/sim_asyncio_ioc.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ async def on_update_name_callback(value, name):
5454
conn.send("R") # "Ready"
5555

5656
# Make sure coverage is written on epicsExit
57-
from pytest_cov.embed import cleanup
58-
sys._run_exitfuncs = cleanup
57+
try:
58+
from pytest_cov.embed import cleanup
59+
sys._run_exitfuncs = cleanup
60+
except ImportError:
61+
pass # Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
5962

6063
select_and_recv(conn, "D") # "Done"
6164
# Attempt to ensure all buffers flushed - C code (from `import pvlog`)

tests/sim_asyncio_ioc_override.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@
4646
conn.send("R") # "Ready"
4747

4848
# Make sure coverage is written on epicsExit
49-
from pytest_cov.embed import cleanup
50-
sys._run_exitfuncs = cleanup
49+
try:
50+
from pytest_cov.embed import cleanup
51+
sys._run_exitfuncs = cleanup
52+
except ImportError:
53+
pass # Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
5154

5255
select_and_recv(conn, "D") # "Done"
5356
# Attempt to ensure all buffers flushed - C code (from `import pvlog`)

0 commit comments

Comments
 (0)