Skip to content

Commit

Permalink
fixed tests other than _event_processor deprecation warning
Browse files Browse the repository at this point in the history
A
  • Loading branch information
evalott100 committed Nov 27, 2024
1 parent 7633bc3 commit ea332bb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 15 deletions.
5 changes: 3 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ def _error_and_kill_pending_tasks(
unfinished_tasks = {
task
for task in asyncio.all_tasks(loop)
if task.get_coro().__name__ not in _ALLOWED_PYTEST_TASKS and not task.done()
if (coro := task.get_coro()) is not None
and coro.__name__ not in _ALLOWED_PYTEST_TASKS
and not task.done()
}
for task in unfinished_tasks:
task.cancel()
Expand Down Expand Up @@ -117,7 +119,6 @@ def fail_test_on_unclosed_tasks(request: FixtureRequest):
fail_count = request.session.testsfailed
loop = asyncio.get_running_loop()

asyncio.set_event_loop(loop)
loop.set_debug(True)

request.addfinalizer(
Expand Down
1 change: 1 addition & 0 deletions tests/core/test_mock_signal_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ async def test_blocks_during_put(mock_signals):
with mock_puts_blocked(signal1, signal2):
status1 = signal1.set("second_value", wait=True, timeout=None)
status2 = signal2.set("second_value", wait=True, timeout=None)
await asyncio.sleep(0.1)
assert await signal1.get_value() == "second_value"
assert await signal2.get_value() == "second_value"
assert not status1.done
Expand Down
16 changes: 8 additions & 8 deletions tests/core/test_readable.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ def test_standard_readable_hints():

assert sr.hints == {}

hint1 = MagicMock()
hint1 = MagicMock(spec=HasHints)
hint1.hints = {"fields": ["abc"], "dimensions": [(["f1", "f2"], "s1")]}

hint2 = MagicMock()
hint2 = MagicMock(spec=HasHints)
hint2.hints = {"fields": ["def", "ghi"]}

hint3 = MagicMock()
hint3 = MagicMock(spec=HasHints)
hint3.hints = {"fields": ["jkl"], "gridding": "rectilinear_nonsequential"}

sr.add_readables([hint1, hint2, hint3])
Expand All @@ -53,10 +53,10 @@ def test_standard_readable_hints():
def test_standard_readable_hints_raises_when_overriding_string_literal():
sr = StandardReadable()

hint1 = MagicMock()
hint1 = MagicMock(spec=HasHints)
hint1.hints = {"gridding": "rectilinear_nonsequential"}

hint2 = MagicMock()
hint2 = MagicMock(spec=HasHints)
hint2.hints = {"gridding": "a different string"}

sr._has_hints = (
Expand All @@ -71,10 +71,10 @@ def test_standard_readable_hints_raises_when_overriding_string_literal():
def test_standard_readable_hints_raises_when_overriding_sequence():
sr = StandardReadable()

hint1 = MagicMock()
hint1 = MagicMock(spec=HasHints)
hint1.hints = {"fields": ["field1", "field2"]}

hint2 = MagicMock()
hint2 = MagicMock(spec=HasHints)
hint2.hints = {"fields": ["field2"]}

sr._has_hints = (
Expand All @@ -90,7 +90,7 @@ def test_standard_readable_hints_raises_when_overriding_sequence():
def test_standard_readable_hints_invalid_types(invalid_type):
sr = StandardReadable()

hint1 = MagicMock()
hint1 = MagicMock(spec=HasHints)
hint1.hints = {"test": invalid_type}

sr._has_hints = (hint1,)
Expand Down
8 changes: 5 additions & 3 deletions tests/epics/adcore/test_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ async def wait_then_fail():
await asyncio.sleep(0)
set_mock_value(driver.detector_state, adcore.DetectorState.DISCONNECTED)

await wait_then_fail()

acquiring = await adcore.start_acquiring_driver_and_ensure_status(
driver, timeout=0.1
)
await wait_then_fail()

with pytest.raises(ValueError):
with pytest.raises(
ValueError, match="Final detector state DetectorState.DISCONNECTED"
):
await acquiring
6 changes: 4 additions & 2 deletions tests/sim/demo/test_sim_motor.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import time

import pytest
from bluesky.plans import spiral_square
from bluesky.run_engine import RunEngine

Expand Down Expand Up @@ -49,6 +50,7 @@ async def test_stop():
new_pos = await m1.user_readback.get_value()
assert new_pos < 10
assert new_pos >= 0.1
# move should not be successful as we stopped it
assert move_status.done

assert not move_status.success
with pytest.raises(RuntimeError, match="Motor was stopped"):
await move_status

0 comments on commit ea332bb

Please sign in to comment.