test(robot-server): replace pytest-aiohttp with pytest-asyncio

robot-server/Pipfile

@@ -13,7 +13,7 @@ robot-server = { editable = true, path = "." }
 atomicwrites = { version = "==1.4.0", sys_platform = "== 'win32'" }
 colorama = { version = "==0.4.4", sys_platform = "== 'win32'" }
 pytest = "~=6.1"
-pytest-aiohttp = "==0.3.0"
+pytest-asyncio = "~=0.18"
 pytest-cov = "==2.10.1"
 pytest-xdist = "~=2.2.1 "
 requests = "==2.26.0"

robot-server/pytest.ini

@@ -1,3 +1,4 @@
 [pytest]
 tavern-global-cfg = tests/integration/common.yaml
 addopts = --color=yes
+asyncio_mode = auto

robot-server/tests/robot/calibration/tip_length/test_util.py

@@ -4,7 +4,7 @@
 
 
 @pytest.fixture
-def machine(loop):
+def machine():
     states = {
         "imaginingTable",
         "millingLumber",

robot-server/tests/service/legacy/routers/test_control.py

@@ -1,4 +1,4 @@
-from asyncio import Event
+import asyncio
 from mock import call, MagicMock
 
 import pytest
@@ -216,13 +216,11 @@ def test_identify(api_client, hardware):
         [control.post_move_robot, None],
     ],
 )
-async def test_concurrent_motion_fails(
-    hardware, loop, blocking_call, blocking_call_data
-):
+async def test_concurrent_motion_fails(hardware, blocking_call, blocking_call_data):
     """A test that while a HOME or MOVE is happening, other HOME and MOVE
     requests will fail."""
-
-    event = Event()
+    loop = asyncio.get_running_loop()
+    event = asyncio.Event()
 
     # A wait that will happen within motion lock
     async def wait_on_event(*args, **kwargs):

robot-server/tests/service/legacy/routers/test_modules.py

@@ -3,6 +3,7 @@
 
 import pytest
 import asyncio
+from decoy import matchers
 from opentrons.hardware_control import ExecutionManager
 from opentrons.hardware_control.modules import (
     MagDeck,
@@ -15,7 +16,7 @@
 
 
 @pytest.fixture
-async def magdeck(loop: asyncio.AbstractEventLoop):
+async def magdeck():
     usb_port = USBPort(
         name="",
         hub=None,
@@ -28,7 +29,7 @@ async def magdeck(loop: asyncio.AbstractEventLoop):
         which="magdeck",
         simulating=True,
         execution_manager=ExecutionManager(),
-        loop=asyncio.get_event_loop(),
+        loop=asyncio.get_running_loop(),
     )
     MagDeck.current_height = PropertyMock(return_value=321)
 
@@ -38,7 +39,7 @@ async def magdeck(loop: asyncio.AbstractEventLoop):
 
 
 @pytest.fixture
-async def tempdeck(loop: asyncio.AbstractEventLoop):
+async def tempdeck():
     usb_port = USBPort(
         name="",
         hub=None,
@@ -51,7 +52,7 @@ async def tempdeck(loop: asyncio.AbstractEventLoop):
         which="tempdeck",
         simulating=True,
         execution_manager=ExecutionManager(),
-        loop=asyncio.get_event_loop(),
+        loop=asyncio.get_running_loop(),
     )
     TempDeck.temperature = PropertyMock(return_value=123.0)
     TempDeck.target = PropertyMock(return_value=321.0)
@@ -62,7 +63,7 @@ async def tempdeck(loop: asyncio.AbstractEventLoop):
 
 
 @pytest.fixture
-async def thermocycler(loop: asyncio.AbstractEventLoop):
+async def thermocycler():
     usb_port = USBPort(
         name="",
         hub=None,
@@ -75,7 +76,7 @@ async def thermocycler(loop: asyncio.AbstractEventLoop):
         which="thermocycler",
         simulating=True,
         execution_manager=ExecutionManager(),
-        loop=loop,
+        loop=asyncio.get_running_loop(),
     )
 
     Thermocycler.lid_status = PropertyMock(return_value="open")
@@ -95,7 +96,7 @@ async def thermocycler(loop: asyncio.AbstractEventLoop):
 
 
 @pytest.fixture
-async def heater_shaker(loop: asyncio.AbstractEventLoop):
+async def heater_shaker():
     """Get a mocked out heater-shaker hardware control object."""
     usb_port = USBPort(
         name="",
@@ -109,7 +110,7 @@ async def heater_shaker(loop: asyncio.AbstractEventLoop):
         which="heatershaker",
         simulating=True,
         execution_manager=ExecutionManager(),
-        loop=loop,
+        loop=asyncio.get_running_loop(),
     )
 
     HeaterShaker.live_data = PropertyMock(
@@ -290,7 +291,9 @@ def test_post_serial_update(api_client, hardware, tempdeck):
         resp = api_client.post("/modules/dummySerialTD/update")
 
         p.assert_called_once_with(
-            tempdeck, tempdeck._bundled_fw.path, asyncio.get_event_loop()
+            tempdeck,
+            tempdeck._bundled_fw.path,
+            matchers.IsA(asyncio.AbstractEventLoop),
         )
 
         body = resp.json()

robot-server/tests/service/session/test_manager.py

@@ -9,7 +9,7 @@
 
 
 @pytest.fixture
-async def session(session_manager, loop) -> BaseSession:
+async def session(session_manager) -> BaseSession:
     """An added session"""
     return await session_manager.add(
         session_type=SessionType.live_protocol, session_meta_data=SessionMetaData()