From 805de2ddde199c08f7176732a6c702245de26b7a Mon Sep 17 00:00:00 2001 From: Joseph Ware Date: Fri, 25 Aug 2023 08:27:55 +0100 Subject: [PATCH] Ensure loop for 3.10 Future --- tests/plans/test_scanspec_metadata.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/plans/test_scanspec_metadata.py b/tests/plans/test_scanspec_metadata.py index 4ff13e6..9d502e5 100644 --- a/tests/plans/test_scanspec_metadata.py +++ b/tests/plans/test_scanspec_metadata.py @@ -1,4 +1,4 @@ -from asyncio import Future +from asyncio import Future, new_event_loop import pytest from bluesky import RunEngine @@ -8,6 +8,13 @@ from dls_bluesky_core.plans import scan +@pytest.fixture(scope="session") +def loop(): + loop = new_event_loop() + yield loop + loop.stop() + + @pytest.fixture def run_engine() -> RunEngine: return RunEngine({}) @@ -30,7 +37,7 @@ def set_result(_, doc): return run_engine.subscribe(name=name, func=set_result) -def test_metadata_of_simple_spec(run_engine, x): +def test_metadata_of_simple_spec(run_engine, x, loop): det = SynGauss( name="det", motor=x, @@ -41,7 +48,7 @@ def test_metadata_of_simple_spec(run_engine, x): ) spec = Line(axis=x.name, start=1, stop=2, num=3) - start_future = Future() + start_future = loop.create_future() tok = capture_document_return_token(start_future, run_engine, "start") run_engine(scan([det], {x.name: x}, spec)) run_engine.unsubscribe(tok) @@ -60,7 +67,7 @@ def test_metadata_of_simple_spec(run_engine, x): assert start_document["detectors"] == [det.name] -def test_metadata_of_spiral_spec(run_engine, x, y): +def test_metadata_of_spiral_spec(run_engine, x, y, loop): det = Syn2DGauss( name="det", motor0=x, @@ -73,7 +80,7 @@ def test_metadata_of_spiral_spec(run_engine, x, y): ) spec = Spiral.spaced(x.name, y.name, 0, 0, 5, 1) - start_future = Future() + start_future = loop.create_future() tok = capture_document_return_token(start_future, run_engine, "start") run_engine(scan([det], {x.name: x, y.name: y}, spec)) run_engine.unsubscribe(tok)