Wait for subprocesses to terminate in conftest

bluesky · Nov 8, 2023 · bde3136 · bde3136
1 parent d378b48
commit bde3136
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/ophyd_async/panda/panda_utils.py b/src/ophyd_async/panda/panda_utils.py
@@ -15,7 +15,7 @@ def _get_panda_phases(panda: PandA, ignore: Optional[List[str]] = None):
 
 def save_panda(panda: PandA, path: str, ignore: Optional[List[str]] = None):
     """
-    Saves all the panda PV's to a yaml file, ignoring any PV's in the `ignore`
+    Saves all the panda PV's to a yaml file, ignoring any PV's in the ignore
     parameter
     """
     phases = yield from _get_panda_phases(panda, ignore=ignore)

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -68,7 +68,10 @@ def pva():
         assert not p.poll(), p.stdout.read()
 
     yield processes
-    [p.terminate() for p in processes]
+
+    for p in processes:
+        p.terminate()
+        p.communicate()
 
 
 @pytest.fixture

diff --git a/tests/core/test_device_save_loader.py b/tests/core/test_device_save_loader.py
@@ -8,6 +8,7 @@
 import pytest
 import yaml
 from bluesky.run_engine import RunEngine
+
 from ophyd_async.core import (
     Device,
     SignalR,

diff --git a/tests/panda/test_panda_utils.py b/tests/panda/test_panda_utils.py
@@ -1,4 +1,3 @@
-from typing import TypeVar
 from unittest.mock import patch
 
 import pytest
@@ -10,8 +9,6 @@
 from ophyd_async.panda import PandA, save_panda
 from ophyd_async.panda.panda_utils import _get_panda_phases
 
-T = TypeVar("T")
-
 
 @pytest.fixture
 async def sim_panda():
@@ -22,7 +19,7 @@ async def sim_panda():
     yield sim_panda
 
 
-async def test_get_panda_phases(sim_panda):
+async def test_get_panda_phases(sim_panda, RE: RunEngine):
     def get_phases(panda):
         phases = yield from _get_panda_phases(panda)
         assert len(phases) == 2
@@ -32,15 +29,15 @@ def get_phases(panda):
             assert not key[-5:] == "units"
         return
 
-    RE = RunEngine()
     set_sim_value(sim_panda.phase_1_signal_units, 1)
     RE(get_phases(sim_panda))
 
 
 @patch("ophyd_async.panda.panda_utils._get_panda_phases")
 @patch("ophyd_async.panda.panda_utils.save_to_yaml")
-async def test_save_panda(mock_save_to_yaml, mock_get_panda_phases, sim_panda):
-    RE = RunEngine()
+async def test_save_panda(
+    mock_save_to_yaml, mock_get_panda_phases, sim_panda, RE: RunEngine
+):
     RE(save_panda(sim_panda, "path"))
     mock_get_panda_phases.assert_called_once()
     mock_save_to_yaml.assert_called_once()