From f5c79eeec0f961b0108f0a89ba158f00183cf693 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 2 Oct 2026 19:29:34 -0500
Subject: [PATCH] [qmi8658] Pin motion_id in test config to fix grouped
 component test conflict (#20075)

---
 tests/components/qmi8658/common-actions.yaml |  2 ++
 tests/components/qmi8658/common.yaml         | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/tests/components/qmi8658/common-actions.yaml b/tests/components/qmi8658/common-actions.yaml
index b8ab845ef1..62371223cc 100644
--- a/tests/components/qmi8658/common-actions.yaml
+++ b/tests/components/qmi8658/common-actions.yaml
@@ -3,5 +3,7 @@ button:
     name: Clear motion calibration
     on_press:
       - motion.clear_calibration:
+          id: qmi8658_motion
       - motion.clear_calibration:
+          id: qmi8658_motion
           save: true
diff --git a/tests/components/qmi8658/common.yaml b/tests/components/qmi8658/common.yaml
index 7d4de0f97e..bfb9caff02 100644
--- a/tests/components/qmi8658/common.yaml
+++ b/tests/components/qmi8658/common.yaml
@@ -3,6 +3,7 @@ sensor:
     name: "QMI8658 Temperature"
 
   - platform: motion
+    motion_id: qmi8658_motion
     type: acceleration_x
     name: "Accel X"
     accuracy_decimals: 4
@@ -11,44 +12,55 @@ sensor:
           window_size: 4
           send_every: 1
   - platform: motion
+    motion_id: qmi8658_motion
     type: acceleration_y
     name: "Accel Y"
     accuracy_decimals: 4
   - platform: motion
+    motion_id: qmi8658_motion
     type: acceleration_z
     name: "Accel Z"
     accuracy_decimals: 4
 
     # Gyroscope axes (unit: °/s)
   - platform: motion
+    motion_id: qmi8658_motion
     type: gyroscope_x
     name: "Gyro X"
   - platform: motion
+    motion_id: qmi8658_motion
     type: gyroscope_y
     name: "Gyro Y"
   - platform: motion
+    motion_id: qmi8658_motion
     type: gyroscope_z
     name: "Gyro Z"
 
   - platform: motion
+    motion_id: qmi8658_motion
     type: angular_rate_x
     name: "Angular Rate X"
   - platform: motion
+    motion_id: qmi8658_motion
     type: angular_rate_y
     name: "Angular Rate Y"
   - platform: motion
+    motion_id: qmi8658_motion
     type: angular_rate_z
     name: "Angular Rate Z"
 
   - platform: motion
+    motion_id: qmi8658_motion
     type: pitch
     name: "Pitch"
   - platform: motion
+    motion_id: qmi8658_motion
     type: roll
     name: "Roll"
 
 motion:
   - platform: qmi8658
+    id: qmi8658_motion
     i2c_id: i2c_bus
     # Accelerometer full-scale range: 2G | 4G | 8G | 16G
     accelerometer_range: 4G