fix(api): ignore missing aionotify more properly (#8154)

Opentrons · Jul 23, 2021 · bb0e3a0 · bb0e3a0
1 parent d9c7ed2
commit bb0e3a0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/api/src/opentrons/hardware_control/controller.py b/api/src/opentrons/hardware_control/controller.py
@@ -7,7 +7,7 @@
 from typing_extensions import Final
 try:
     import aionotify  # type: ignore
-except OSError:
+except (OSError, ModuleNotFoundError):
     aionotify = None  # type: ignore
 
 from opentrons.drivers.smoothie_drivers import driver_3_0

diff --git a/api/tests/opentrons/conftest.py b/api/tests/opentrons/conftest.py
@@ -9,7 +9,7 @@
 
 try:
     import aionotify
-except OSError:
+except (OSError, ModuleNotFoundError):
     aionotify = None  # type: ignore
 import asyncio
 import os

diff --git a/api/tests/opentrons/hardware_control/test_instruments.py b/api/tests/opentrons/hardware_control/test_instruments.py
@@ -2,7 +2,7 @@
 from unittest import mock
 try:
     import aionotify
-except OSError:
+except (OSError, ModuleNotFoundError):
     aionotify = None  # type: ignore
 import pytest
 import typeguard

diff --git a/api/tests/opentrons/hardware_control/test_modules.py b/api/tests/opentrons/hardware_control/test_modules.py
@@ -2,10 +2,6 @@
 from pathlib import Path
 from unittest import mock
 import pytest
-try:
-    import aionotify
-except OSError:
-    aionotify = None  # type: ignore
 from opentrons.hardware_control import ExecutionManager
 from opentrons.hardware_control.modules import ModuleAtPort
 from opentrons.hardware_control.modules.types import (