Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 004f311e authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Arpit Singh
Browse files

Fix flakiness for ExternalStylusConnectedDuringTouchGesture 

Remove assertions on NotifyDeviceReset args for the integration test,
as these can be flaky and inconsistent for different device types based
on how many displays, touchscreen devices, etc. that the device has.

Bug: 295149130
Test: atest inputflinger_tests:TouchIntegrationTest#ExternalStylusConnectedDuringTouchGesture --rerun-until-failure
Change-Id: Ic8cb4d7053c95a3f955b203017e2a72db9facaee
parent 01981dd0

services/inputflinger/tests/InputReader_test.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1830,9 +1830,6 @@ TEST_F(TouchIntegrationTest, NotifiesPolicyWhenStylusGestureStarted) { 
}















TEST_F(TouchIntegrationTest, ExternalStylusConnectedDuringTouchGesture) {













    ASSERT_NO_FATAL_FAILURE(













            mTestListener->assertNotifyDeviceResetWasCalled(WithDeviceId(mDeviceInfo.getId())));













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyDeviceResetWasNotCalled());















    const Point centerPoint = mDevice->getCenterPoint();





























    // Down









@@ -1855,9 +1852,6 @@ TEST_F(TouchIntegrationTest, ExternalStylusConnectedDuringTouchGesture) {













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyConfigurationChangedWasCalled());















    const auto stylusInfo = findDeviceByName(externalStylus->getName());















    ASSERT_TRUE(stylusInfo);













    ASSERT_NO_FATAL_FAILURE(













            mTestListener->assertNotifyDeviceResetWasCalled(WithDeviceId(stylusInfo->getId())));













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyDeviceResetWasNotCalled());





























    // Move















    mDevice->sendMove(centerPoint + Point(2, 2));