integration tests.

Opentrons · Apr 20, 2022 · b827a4a · b827a4a
1 parent 7d51f60
commit b827a4a
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 10 deletions.
diff --git a/hardware/tests/firmware_integration/conftest.py b/hardware/tests/firmware_integration/conftest.py
@@ -15,7 +15,6 @@
 
 @pytest.fixture
 async def driver(
-    loop: asyncio.BaseEventLoop,
 ) -> AsyncGenerator[AbstractCanDriver, None]:
     """Create CanDriver connected to OT-3 Emulator."""
     settings = DriverSettings()

diff --git a/hardware/tests/firmware_integration/test_attached_tools.py b/hardware/tests/firmware_integration/test_attached_tools.py
@@ -23,7 +23,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_attached_tools_request(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
 ) -> None:

diff --git a/hardware/tests/firmware_integration/test_device_info.py b/hardware/tests/firmware_integration/test_device_info.py
@@ -23,7 +23,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_broadcast(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
 ) -> None:
@@ -44,14 +43,13 @@ async def _check() -> None:
             if arbitration_id.parts.originating_node_id in nodes:
                 nodes.remove(arbitration_id.parts.originating_node_id)
 
-    t = loop.create_task(_check())
+    t = asyncio.get_running_loop().create_task(_check())
     await asyncio.wait_for(t, 1)
 
 
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_each_node(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
     subsystem_node_id: NodeId,

diff --git a/hardware/tests/firmware_integration/test_eeprom.py b/hardware/tests/firmware_integration/test_eeprom.py
@@ -25,7 +25,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_read_write(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
 ) -> None:

diff --git a/hardware/tests/firmware_integration/test_motion_constraints.py b/hardware/tests/firmware_integration/test_motion_constraints.py
@@ -24,7 +24,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_each_node(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
     motor_node_id: NodeId,

diff --git a/hardware/tests/firmware_integration/test_motor_driver.py b/hardware/tests/firmware_integration/test_motor_driver.py
@@ -25,7 +25,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_read_write(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
     motor_node_id: NodeId,

diff --git a/hardware/tests/firmware_integration/test_move_groups.py b/hardware/tests/firmware_integration/test_move_groups.py
@@ -43,7 +43,6 @@ def filter_func(arb: ArbitrationId) -> bool:
 @pytest.mark.requires_emulator
 @pytest.mark.can_filter_func.with_args(filter_func)
 async def test_add_moves(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
     motor_node_id: NodeId,
@@ -87,7 +86,6 @@ async def test_add_moves(
 
 @pytest.mark.requires_emulator
 async def test_move_integration(
-    loop: asyncio.BaseEventLoop,
     can_messenger: CanMessenger,
     can_messenger_queue: WaitableCallback,
     all_motor_nodes: List[NodeId],