summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prabir Pradhan <prabirmsp@google.com> 2025-01-02 14:03:48 -0800
committer Prabir Pradhan <prabirmsp@google.com> 2025-01-02 14:03:48 -0800
commit3ef3c4d9544b7b4d18e72c5783bd3e34d32047f9 (patch)
tree8fc247fe3eda899e1b46d82877e79a5ee2a76d12
parentedc714653a4f690c34ff6897e3ae4d1e79d1d38e (diff)
ExternalStylusIntegrationTest: Reduce likelihood for flake
In the test, an event will be generated after a 72ms timeout, and we assert that no event is generated before that timeout. Since this is a racy assertion, just wait for 1ms to ensure that an event isn't immediately generated. If this is not enough to bring the flakes rates to an acceptable level, we will need to refactor the tests to remove the race altogether. Bug: 386801813 Change-Id: Id223930925ce724e216e61a9e68e1da79bed6f04 Test: Presubmit Flag: TEST_ONLY
-rw-r--r--services/inputflinger/tests/InputReader_test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/inputflinger/tests/InputReader_test.cpp b/services/inputflinger/tests/InputReader_test.cpp
index 9d2256f52f..0906536e32 100644
--- a/services/inputflinger/tests/InputReader_test.cpp
+++ b/services/inputflinger/tests/InputReader_test.cpp
@@ -2474,10 +2474,10 @@ TEST_F(ExternalStylusIntegrationTest, FusedExternalStylusPressureNotReported) {
const auto syncTime = std::chrono::system_clock::now();
// After 72 ms, the event *will* be generated. If we wait the full 72 ms to check that NO event
// is generated in that period, there will be a race condition between the event being generated
- // and the test's wait timeout expiring. Thus, we wait for a shorter duration in the test, which
- // will reduce the liklihood of the race condition occurring.
- const auto waitUntilTimeForNoEvent =
- syncTime + std::chrono::milliseconds(ns2ms(EXTERNAL_STYLUS_DATA_TIMEOUT / 2));
+ // and the test's wait timeout expiring. Thus, we wait for a shorter duration in the test to
+ // ensure the event is not immediately generated, which should reduce the liklihood of the race
+ // condition occurring.
+ const auto waitUntilTimeForNoEvent = syncTime + std::chrono::milliseconds(1);
mDevice->sendSync();
ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyMotionWasNotCalled(waitUntilTimeForNoEvent));