From 76b4c31ee90a92187af53521ba60e96dbc9487e9 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 12 May 2022 11:16:42 +0200 Subject: [PATCH] linux: Add non-hid parent to hidpp tests While not needed currently, there is a discussion to ignore the "hid" subsystem parents when searching for siblings. Add in appropriate parents to the tests so that such a change will not result in a failure. --- src/linux/integration-test.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py index f3e92f2..cb5992a 100755 --- a/src/linux/integration-test.py +++ b/src/linux/integration-test.py @@ -1270,9 +1270,17 @@ class Tests(dbusmock.DBusTestCase): def test_hidpp_mouse(self): '''HID++ mouse battery''' + parent = self.testbed.add_device('usb', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2', + None, + [], []) + parent = self.testbed.add_device('hid', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009', + parent, + [], []) dev = self.testbed.add_device('hid', '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009/0003:046D:4101.000A', - None, + parent, [], []) parent = dev @@ -1354,9 +1362,17 @@ class Tests(dbusmock.DBusTestCase): def test_hidpp_touchpad_race(self): '''HID++ touchpad with input node that appears later''' + parent = self.testbed.add_device('usb', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2', + None, + [], []) + parent = self.testbed.add_device('hid', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009', + parent, + [], []) dev = self.testbed.add_device('hid', '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009/0003:046D:4101.000A', - None, + parent, [], []) parent = dev @@ -1403,9 +1419,17 @@ class Tests(dbusmock.DBusTestCase): def test_hidpp_touchpad(self): '''HID++ touchpad battery with 5 capacity levels''' + parent = self.testbed.add_device('usb', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2', + None, + [], []) + parent = self.testbed.add_device('hid', + '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009', + parent, + [], []) dev = self.testbed.add_device('hid', '/devices/pci0000:00/0000:00:14.0/usb3/3-10/3-10:1.2/0003:046D:C52B.0009/0003:046D:4101.000A', - None, + parent, [], []) parent = dev