macOS: Run MetaDrive test

conftest.py

@@ -3,6 +3,7 @@
 import os
 import pytest
 import random
+import sys
 
 from openpilot.common.prefix import OpenpilotPrefix
 from openpilot.system.manager import manager
@@ -53,13 +54,16 @@ def openpilot_function_fixture(request):
 
   with clean_env():
     # setup a clean environment for each test
-    with OpenpilotPrefix(shared_download_cache=request.node.get_closest_marker("shared_download_cache") is not None) as prefix:
-      prefix = os.environ["OPENPILOT_PREFIX"]
+    if sys.platform != 'darwin':  # TODO no tempfs on macOS
+      with OpenpilotPrefix(shared_download_cache=request.node.get_closest_marker("shared_download_cache") is not None) as prefix:
+        prefix = os.environ["OPENPILOT_PREFIX"]
 
-      yield
+        yield
 
-      # ensure the test doesn't change the prefix
-      assert "OPENPILOT_PREFIX" in os.environ and prefix == os.environ["OPENPILOT_PREFIX"]
+        # ensure the test doesn't change the prefix
+        assert "OPENPILOT_PREFIX" in os.environ and prefix == os.environ["OPENPILOT_PREFIX"]
+    else:
+      yield
 
     # cleanup any started processes
     manager.manager_cleanup()

pyproject.toml

@@ -40,6 +40,7 @@ dependencies = [
   # modeld
   "onnx >= 1.14.0",
   "onnxruntime >=1.16.3; platform_system == 'Linux' and platform_machine == 'aarch64'",
+  "onnxruntime >=1.16.3; platform_system == 'Darwin'",
   "onnxruntime-gpu >=1.16.3; platform_system == 'Linux' and platform_machine == 'x86_64'",
 
   # logging
@@ -117,7 +118,7 @@ dev = [
 ]
 
 tools = [
-  "metadrive-simulator @ https://github.com/commaai/metadrive/releases/download/MetaDrive-minimal/metadrive_simulator-0.4.2.3-py3-none-any.whl ; (platform_machine != 'aarch64')",
+  "metadrive-simulator @ https://github.com/JakobSpahn/metadrive/releases/download/MetaDrive-minimal-v2/metadrive_simulator-0.4.2.3-py3-none-any.whl ; (platform_machine != 'aarch64')",
   "rerun-sdk >= 0.18",
 ]
 

tools/sim/launch_openpilot.sh

@@ -12,6 +12,10 @@ if [[ "$CI" ]]; then
   export BLOCK="${BLOCK},ui"
 fi
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  export BLOCK="${BLOCK},logcatd,proclogd"  # TODO no systemd, no /proc on macOS
+fi
+
 python3 -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()"
 
 SCRIPT_DIR=$(dirname "$0")