Tweaks to make it work at DLS

Author: coretl

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
 requires = ["setuptools", "wheel", "setuptools_dso", "epicscorelibs>=7.0.4.99.1"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta:__legacy__"

setup.py

@@ -74,7 +74,7 @@ def _add_file(f):
     ],
     dsos = ['epicscorelibs.lib.dbCore', 'epicscorelibs.lib.Com'],
     define_macros = get_config_var('CPPFLAGS'),
-    extra_compile_args = get_config_var('CFLAGS'),
+    extra_compile_args = get_config_var('CFLAGS') + ["-std=c99"],
     extra_link_args = get_config_var('LDFLAGS'),
 )
 

tests/test_asyncio.py

@@ -19,10 +19,12 @@ def asyncio_ioc():
         cmd, stdin=subprocess.PIPE,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     yield proc
-    proc.kill()
-    out, err = proc.communicate()
-    print(out.decode())
-    print(err.decode(), file=sys.stderr)
+    if proc.returncode is None:
+        # still running, kill it and print the output
+        proc.kill()
+        out, err = proc.communicate()
+        print(out.decode())
+        print(err.decode(), file=sys.stderr)
 
 
 @pytest.mark.asyncio
@@ -44,9 +46,9 @@ async def test_asyncio_ioc(asyncio_ioc):
     # AO
     assert await caget(PV_PREFIX + ":AO2") == 12.45
     await caput(PV_PREFIX + ":AO2", 3.56, wait=True)
-    await asyncio.sleep(0.3)
+    await asyncio.sleep(0.1)
     assert await caget(PV_PREFIX + ":AI") == 12.34
-    await asyncio.sleep(0.5)
+    await asyncio.sleep(0.6)
     assert await caget(PV_PREFIX + ":AI") == 3.56
     # Wait for a bit longer for the print output to flush
     await asyncio.sleep(2)

tests/test_cothread.py

@@ -21,16 +21,13 @@ def cothread_ioc():
         cmd, stdin=subprocess.PIPE,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     yield proc
-    # This has to work on Python2 and 3 so can't rely on communicate to
-    # produce stdout and stderr if we already closed the process
-    try:
+    if proc.returncode is None:
+        # still running, kill it and print the output
         proc.kill()
         out, err = proc.communicate()
         print(out.decode())
         print(err.decode())
-    except OSError:
-        # Doesn't matter if its already stopped
-        pass
+
 
 
 def test_cothread_ioc(cothread_ioc):