Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,4 @@ asyncio_mode = auto
[coverage:run]
# This is covered in the versiongit test suite so exclude it here
omit = */_version_git.py
patch = subprocess
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def enable_code_coverage():
try:
from pytest_cov.embed import cleanup_on_sigterm
except ImportError:
pass
pass # Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
else:
cleanup_on_sigterm()

Expand Down
8 changes: 6 additions & 2 deletions tests/sim_asyncio_ioc.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ async def on_update_name_callback(value, name):
conn.send("R") # "Ready"

# Make sure coverage is written on epicsExit
from pytest_cov.embed import cleanup
sys._run_exitfuncs = cleanup
try:
from pytest_cov.embed import cleanup
sys._run_exitfuncs = cleanup
except ImportError:
# Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
pass

select_and_recv(conn, "D") # "Done"
# Attempt to ensure all buffers flushed - C code (from `import pvlog`)
Expand Down
8 changes: 6 additions & 2 deletions tests/sim_asyncio_ioc_override.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@
conn.send("R") # "Ready"

# Make sure coverage is written on epicsExit
from pytest_cov.embed import cleanup
sys._run_exitfuncs = cleanup
try:
from pytest_cov.embed import cleanup
sys._run_exitfuncs = cleanup
except ImportError:
# Note that pytest_cov.embed no longer exists in pytest_cov>=7.0.0
pass

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