fix: import issues (#332)

Author: k9ert

test/native_support.py

@@ -23,7 +23,8 @@ def _ensure_submodule(package, name, attrs):
     setattr(parent, name, module)
     return module
 
-
+# The setup_native_stubs() function creates mock/stub implementations of 
+# MicroPython-specific modules that don't exist in regular Python
 def setup_native_stubs():
     if sys.implementation.name == 'micropython':
         return
@@ -188,9 +189,10 @@ def _native_get_prefix(self, stream):
         BaseApp.get_prefix = _native_get_prefix
 
     try:
+        import embit.util
         from apps.wallets.wallet import Wallet as _Wallet
     except ModuleNotFoundError as exc:
-        if exc.name == "embit":
+        if exc.name.startswith("embit"):
             raise ModuleNotFoundError(
                 "Native test suite requires the 'embit' package. "
                 "Install it with 'pip install -r test/integration/requirements.txt'."

test/run_native_tests.py

@@ -2,11 +2,18 @@
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parent
-sys.path.insert(0, str((ROOT / "../src").resolve()))
-sys.path.insert(0, str((ROOT / "../f469-disco/libs/common").resolve()))
-sys.path.insert(0, str((ROOT / "../f469-disco/libs/unix").resolve()))
-sys.path.insert(0, str((ROOT / "../f469-disco/usermods/udisplay_f469/display_unixport").resolve()))
-sys.path.insert(0, str((ROOT / "../f469-disco/tests").resolve()))
+# Insert src directly after the local dir (highest prio)
+sys.path.insert(1, str((ROOT / "../src").resolve()))
+
+# make the other stuff available with lowest prio
+sys.path.append(str((ROOT / "../f469-disco/libs/common").resolve()))
+sys.path.append(str((ROOT / "../f469-disco/libs/unix").resolve()))
+sys.path.append(str((ROOT / "../f469-disco/usermods/udisplay_f469/display_unixport").resolve()))
+sys.path.append(str((ROOT / "../f469-disco/tests").resolve()))
+
+# uncomment if import issues
+#print("Import priotisation:")
+#print('\n'.join(f'{i}: {p}' for i, p in enumerate(sys.path[:10])))
 
 from native_support import setup_native_stubs