[PATCH] selftests/hid: wacom: fix confidence tests

[PATCH] selftests/hid: wacom: fix confidence tests

[Benjamin Tissoires]

The device is exported with a fuzz of 4, meaning that the `+ t` here
is removed by the fuzz algorithm, making those tests failing.

Not sure why, but when I run this locally it was passing, but not in the
VM.

Link: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/53692957#L3315
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
---
Over the break the test suite wasn't properly running on my runner,
and this small issue sneaked in.
---
 tools/testing/selftests/hid/tests/test_wacom_generic.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/hid/tests/test_wacom_generic.py b/tools/testing/selftests/hid/tests/test_wacom_generic.py
index 352fc39f3c6c..b62c7dba6777 100644
--- a/tools/testing/selftests/hid/tests/test_wacom_generic.py
+++ b/tools/testing/selftests/hid/tests/test_wacom_generic.py
@@ -880,8 +880,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest
         does not overlap with other contacts. The value of `t` may be
         incremented over time to move the point along a linear path.
         """
-        x = 50 + 10 * contact_id + t
-        y = 100 + 100 * contact_id + t
+        x = 50 + 10 * contact_id + t * 11
+        y = 100 + 100 * contact_id + t * 11
         return test_multitouch.Touch(contact_id, x, y)
 
     def make_contacts(self, n, t=0):
@@ -902,8 +902,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest
         tracking_id = contact_ids.tracking_id
         slot_num = contact_ids.slot_num
 
-        x = 50 + 10 * contact_id + t
-        y = 100 + 100 * contact_id + t
+        x = 50 + 10 * contact_id + t * 11
+        y = 100 + 100 * contact_id + t * 11
 
         # If the data isn't supposed to be stored in any slots, there is
         # nothing we can check for in the evdev stream.

---
base-commit: 80d5a73edcfbd1d8d6a4c2b755873c5d63a1ebd7
change-id: 20240117-b4-wip-wacom-tests-fixes-298b50bea47f

Best regards,
-- 
Benjamin Tissoires <bentiss@kernel.org>

Re: [PATCH] selftests/hid: wacom: fix confidence tests

[Benjamin Tissoires]

On Wed, Jan 17, 2024 at 7:12 PM Jason Gerecke <killertofu@gmail.com> wrote:
>
> LGTM. Acked-by: Jason Gerecke <jason.gerecke@wacom.com>

Thanks!

I'll add a:
Fixes: b0fb904d074e ("HID: wacom: Add additional tests of confidence behavior")

And send to Linus in the next round for 6.8 so we also fix the future
for-6.9 branches

Cheers,
Benjamin


>
>
> Jason
> ---
> Now instead of four in the eights place /
> you’ve got three, ‘Cause you added one  /
> (That is to say, eight) to the two,     /
> But you can’t take seven from three,    /
> So you look at the sixty-fours....
>
>
>
> On Wed, Jan 17, 2024 at 5:27 AM Benjamin Tissoires <bentiss@kernel.org> wrote:
>>
>> The device is exported with a fuzz of 4, meaning that the `+ t` here
>> is removed by the fuzz algorithm, making those tests failing.
>>
>> Not sure why, but when I run this locally it was passing, but not in the
>> VM.
>>
>> Link: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/53692957#L3315
>> Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
>> ---
>> Over the break the test suite wasn't properly running on my runner,
>> and this small issue sneaked in.
>> ---
>>  tools/testing/selftests/hid/tests/test_wacom_generic.py | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/testing/selftests/hid/tests/test_wacom_generic.py b/tools/testing/selftests/hid/tests/test_wacom_generic.py
>> index 352fc39f3c6c..b62c7dba6777 100644
>> --- a/tools/testing/selftests/hid/tests/test_wacom_generic.py
>> +++ b/tools/testing/selftests/hid/tests/test_wacom_generic.py
>> @@ -880,8 +880,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest
>>          does not overlap with other contacts. The value of `t` may be
>>          incremented over time to move the point along a linear path.
>>          """
>> -        x = 50 + 10 * contact_id + t
>> -        y = 100 + 100 * contact_id + t
>> +        x = 50 + 10 * contact_id + t * 11
>> +        y = 100 + 100 * contact_id + t * 11
>>          return test_multitouch.Touch(contact_id, x, y)
>>
>>      def make_contacts(self, n, t=0):
>> @@ -902,8 +902,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest
>>          tracking_id = contact_ids.tracking_id
>>          slot_num = contact_ids.slot_num
>>
>> -        x = 50 + 10 * contact_id + t
>> -        y = 100 + 100 * contact_id + t
>> +        x = 50 + 10 * contact_id + t * 11
>> +        y = 100 + 100 * contact_id + t * 11
>>
>>          # If the data isn't supposed to be stored in any slots, there is
>>          # nothing we can check for in the evdev stream.
>>
>> ---
>> base-commit: 80d5a73edcfbd1d8d6a4c2b755873c5d63a1ebd7
>> change-id: 20240117-b4-wip-wacom-tests-fixes-298b50bea47f
>>
>> Best regards,
>> --
>> Benjamin Tissoires <bentiss@kernel.org>
>>
>>

Re: [PATCH] selftests/hid: wacom: fix confidence tests

[Benjamin Tissoires]

On Wed, 17 Jan 2024 14:27:15 +0100, Benjamin Tissoires wrote:
> The device is exported with a fuzz of 4, meaning that the `+ t` here
> is removed by the fuzz algorithm, making those tests failing.
> 
> Not sure why, but when I run this locally it was passing, but not in the
> VM.
> 
> 
> [...]

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git (for-6.8/upstream-fixes), thanks!

[1/1] selftests/hid: wacom: fix confidence tests
      https://git.kernel.org/hid/hid/c/4d695869d3fb

Cheers,
-- 
Benjamin Tissoires <bentiss@kernel.org>