Commit c85a8cb9 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

selftests/hid: run ruff format on the python part 



We aim at syncing with the hid-tools repo on
gitlab.freedesktop.org/libevdev/hid-tools. One of the commits is this
mechanical formatting, so pull it over here so changes are not hidden by
those.

Reviewed-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Link: https://patch.msgid.link/20250709-wip-fix-ci-v1-1-b7df4c271cf8@kernel.org


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 1f988d07

tools/testing/selftests/hid/tests/test_tablet.py

+2 −2
Original line number Diff line number Diff line
@@ -1228,9 +1228,9 @@ class Huion_Kamvas_Pro_19_256c_006b(PenDigitizer): 
        pen.current_state = state



    def call_input_event(self, report):

        if report[0] == 0x0a:

        if report[0] == 0x0A:

            # ensures the original second Eraser usage is null

            report[1] &= 0xdf

            report[1] &= 0xDF



            # ensures the original last bit is equal to bit 6 (In Range)

            if report[1] & 0x40:

tools/testing/selftests/hid/tests/test_wacom_generic.py

+323 −113
Original line number Diff line number Diff line
@@ -997,12 +997,17 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 


        assert libevdev.InputEvent(libevdev.EV_KEY.BTN_TOUCH, 1) in events



        self.assert_contacts(uhdev, evdev,

            [ self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None),

        self.assert_contacts(

            uhdev,

            evdev,

            [

                self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),

                self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),

                self.ContactIds(contact_id=2, tracking_id=-1, slot_num=None),

                self.ContactIds(contact_id=3, tracking_id=1, slot_num=1),

              self.ContactIds(contact_id = 4, tracking_id = -1, slot_num = None) ])

                self.ContactIds(contact_id=4, tracking_id=-1, slot_num=None),

            ],

        )



    def confidence_change_assert_playback(self, uhdev, evdev, timeline):

        """
@@ -1044,27 +1049,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 
        uhdev = self.uhdev

        evdev = uhdev.get_evdev()



        self.confidence_change_assert_playback(uhdev, evdev, [

        self.confidence_change_assert_playback(

            uhdev,

            evdev,

            [

                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident

                # Both fingers confidently in contact

            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=1: Contact 0 == !Down + confident; Contact 1 == Down + confident

                # First finger looses confidence and clears only the tipswitch flag

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]

        ])

                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

            ],

        )



    def test_confidence_loss_b(self):

        """
@@ -1079,27 +1125,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 
        uhdev = self.uhdev

        evdev = uhdev.get_evdev()



        self.confidence_change_assert_playback(uhdev, evdev, [

        self.confidence_change_assert_playback(

            uhdev,

            evdev,

            [

                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident

                # Both fingers confidently in contact

            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=1: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger looses confidence and has both flags cleared simultaneously

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]

        ])

                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

            ],

        )



    def test_confidence_loss_c(self):

        """
@@ -1113,27 +1200,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 
        uhdev = self.uhdev

        evdev = uhdev.get_evdev()



        self.confidence_change_assert_playback(uhdev, evdev, [

        self.confidence_change_assert_playback(

            uhdev,

            evdev,

            [

                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident

                # Both fingers confidently in contact

            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident

                # First finger looses confidence and clears only the confidence flag

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), True, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        True,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=2: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=3: Contact 0 == !Down + !confident; Contact 1 == Down + confident

                # First finger has lost confidence and has both flags cleared

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]

        ])

                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

            ],

        )



    def test_confidence_gain_a(self):

        """
@@ -1144,27 +1272,68 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 
        uhdev = self.uhdev

        evdev = uhdev.get_evdev()



        self.confidence_change_assert_playback(uhdev, evdev, [

        self.confidence_change_assert_playback(

            uhdev,

            evdev,

            [

                # t=0: Contact 0 == Down + !confident; Contact 1 == Down + confident

                # Only second finger is confidently in contact

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None), True, False),

             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),

                        True,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                ],

                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident

                # First finger gains confidence

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = None), True, False),

             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=None),

                        True,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                ],

                # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident

                # First finger remains confident

            [(self.ContactIds(contact_id = 0, tracking_id = 1, slot_num = 1), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                ],

                # t=3: Contact 0 == Down + confident; Contact 1 == Down + confident

                # First finger remains confident

            [(self.ContactIds(contact_id = 0, tracking_id = 1, slot_num = 1), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 0, slot_num = 0), True, True)]

        ])

                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                ],

            ],

        )



    def test_confidence_gain_b(self):

        """
@@ -1175,24 +1344,65 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest 
        uhdev = self.uhdev

        evdev = uhdev.get_evdev()



        self.confidence_change_assert_playback(uhdev, evdev, [

        self.confidence_change_assert_playback(

            uhdev,

            evdev,

            [

                # t=0: Contact 0 == Down + confident; Contact 1 == Down + confident

                # First and second finger confidently in contact

            [(self.ContactIds(contact_id = 0, tracking_id = 0, slot_num = 0), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=0, slot_num=0),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=1: Contact 0 == Down + !confident; Contact 1 == Down + confident

                # Firtst finger looses confidence

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), True, False),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        True,

                        False,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=2: Contact 0 == Down + confident; Contact 1 == Down + confident

                # First finger gains confidence

            [(self.ContactIds(contact_id = 0, tracking_id = 2, slot_num = 0), True, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)],



                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=2, slot_num=0),

                        True,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

                # t=3: Contact 0 == !Down + confident; Contact 1 == Down + confident

                # First finger goes up

            [(self.ContactIds(contact_id = 0, tracking_id = -1, slot_num = 0), False, True),

             (self.ContactIds(contact_id = 1, tracking_id = 1, slot_num = 1), True, True)]

        ])
 
                [

                    (

                        self.ContactIds(contact_id=0, tracking_id=-1, slot_num=0),

                        False,

                        True,

                    ),

                    (

                        self.ContactIds(contact_id=1, tracking_id=1, slot_num=1),

                        True,

                        True,

                    ),

                ],

            ],

        )