From 99d9b70146a6665d239e9baf61019a186329a813 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 6 Mar 2026 22:16:04 +0700
Subject: [PATCH 1/2] enable hil test for mtp

---
 test/hil/hil_test.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py
index f3cead7a3..f0b24b3ff 100755
--- a/test/hil/hil_test.py
+++ b/test/hil/hil_test.py
@@ -47,7 +47,7 @@ from multiprocessing import Pool
 import fs
 import hashlib
 import ctypes
-from pymtp import MTP
+from pymtp import MTP, LIBMTP_MTPDevice, LIBMTP_RawDevice
 import string
 
 ENUM_TIMEOUT = 30
@@ -150,17 +150,22 @@ def read_disk_file(uid, lun, fname):
 
 def open_mtp_dev(uid):
     mtp = MTP()
+    # Set proper return type for LIBMTP_Open_Raw_Device (pymtp doesn't define it)
+    mtp.mtp.LIBMTP_Open_Raw_Device.restype = ctypes.POINTER(LIBMTP_MTPDevice)
+    mtp.mtp.LIBMTP_Open_Raw_Device.argtypes = [ctypes.POINTER(LIBMTP_RawDevice)]
     # MTP seems to take a while to enumerate
     timeout = 2 * ENUM_TIMEOUT
     while timeout > 0:
-        # run_cmd(f"gio mount -u mtp://TinyUsb_TinyUsb_Device_{uid}/")
+        # unmount gio/gvfs MTP mount which blocks libmtp from accessing the device
+        subprocess.run(f"gio mount -u mtp://TinyUsb_TinyUsb_Device_{uid}/",
+                       shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         for raw in mtp.detect_devices():
             mtp.device = mtp.mtp.LIBMTP_Open_Raw_Device(ctypes.byref(raw))
             if mtp.device:
                 sn = mtp.get_serialnumber().decode('utf-8')
-                #print(f'mtp serial = {sn}')
                 if sn == uid:
                     return mtp
+                mtp.disconnect()
         time.sleep(1)
         timeout -= 1
     return None
@@ -753,7 +758,7 @@ device_tests = [
     'device/cdc_msc_freertos',
     'device/hid_boot_interface',
     'device/printer_to_cdc',
-    # 'device/mtp'
+    'device/mtp'
 ]
 
 dual_tests = [

From 97297fe08bf0357b447f9c735612ce5f03146a31 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sat, 7 Mar 2026 11:12:48 +0700
Subject: [PATCH 2/2] update hil test: remove unused ctypes, add fallback for
 skip boards

---
 .github/workflows/build.yml              | 9 ++++++++-
 .github/workflows/claude-code-review.yml | 1 +
 test/hil/hil_test.py                     | 5 +----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d8b90f5a..ab1d3611f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -291,7 +291,14 @@ jobs:
 
       - name: Test on actual hardware
         run: |
-          python3 test/hil/hil_test.py ${{ env.HIL_JSON }} $SKIP_BOARDS
+          python3 test/hil/hil_test.py ${{ env.HIL_JSON }} $SKIP_BOARDS || \
+          (if [ -f "${{ env.HIL_JSON }}.skip" ]; then
+            SKIP_BOARDS=$(cat "${{ env.HIL_JSON }}.skip")
+            echo "Re-running with SKIP_BOARDS=$SKIP_BOARDS"
+            python3 test/hil/hil_test.py ${{ env.HIL_JSON }} $SKIP_BOARDS
+          else
+            exit 1
+          fi)
 
   # ---------------------------------------
   # Hardware in the loop (HIL)
diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index 5ba2fe900..5d7efc115 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   claude-review:
+    if: false
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py
index f0b24b3ff..7cffd2da8 100755
--- a/test/hil/hil_test.py
+++ b/test/hil/hil_test.py
@@ -47,7 +47,7 @@ from multiprocessing import Pool
 import fs
 import hashlib
 import ctypes
-from pymtp import MTP, LIBMTP_MTPDevice, LIBMTP_RawDevice
+from pymtp import MTP
 import string
 
 ENUM_TIMEOUT = 30
@@ -150,9 +150,6 @@ def read_disk_file(uid, lun, fname):
 
 def open_mtp_dev(uid):
     mtp = MTP()
-    # Set proper return type for LIBMTP_Open_Raw_Device (pymtp doesn't define it)
-    mtp.mtp.LIBMTP_Open_Raw_Device.restype = ctypes.POINTER(LIBMTP_MTPDevice)
-    mtp.mtp.LIBMTP_Open_Raw_Device.argtypes = [ctypes.POINTER(LIBMTP_RawDevice)]
     # MTP seems to take a while to enumerate
     timeout = 2 * ENUM_TIMEOUT
     while timeout > 0: