Merge pull request #192 from DiamondLightSource/fix_pytest-cov_ci_fails

Add required configuration for pytest-codecov 7

Author: AlexanderWells-diamond

setup.cfg

@@ -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

tests/conftest.py

@@ -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()
 

tests/sim_asyncio_ioc.py

@@ -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`)

tests/sim_asyncio_ioc_override.py

@@ -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`)