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

Commit 2aef4b48 authored by Peng Xu's avatar Peng Xu
Browse files

Sensor VTS testBatchingOperation flakiness fix

This CL is cherry-picked from internal branch oc-dev.

Bug: 64732324
Bug: 63529148
Test: testBatchingOperation passes consistently
Merged-In: Id4e8075e249f3658f5683d53d6dc8403ee32bc4a
Change-Id: Id4e8075e249f3658f5683d53d6dc8403ee32bc4a
parent 9dc12843
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -1221,16 +1221,17 @@ void SensorsHidlTest::testBatchingOperation(SensorType type) {
  usleep(batchingPeriodInNs / 1000 * 8 / 10);

  SensorsHidlEnvironment::Instance()->setCollection(true);
  // 0.8 + 0.3 times the batching period
  // plus some time for the event to deliver
  events = collectEvents(
      batchingPeriodInNs / 1000 * 3 / 10,
        minFifoCount, true /*clearBeforeStart*/, false /*change collection*/);
  // clean existing collections
  collectEvents(0 /*timeLimitUs*/, 0/*nEventLimit*/,
        true /*clearBeforeStart*/, false /*change collection*/);

  // 0.8 + 0.2 times the batching period
  usleep(batchingPeriodInNs / 1000 * 8 / 10);
  ASSERT_EQ(flush(handle), Result::OK);

  // plus some time for the event to deliver
  events = collectEvents(allowedBatchDeliverTimeNs / 1000,
        minFifoCount, true /*clearBeforeStart*/, false /*change collection*/);
        minFifoCount, false /*clearBeforeStart*/, false /*change collection*/);

  SensorsHidlEnvironment::Instance()->setCollection(false);
  ASSERT_EQ(activate(handle, 0), Result::OK);
@@ -1243,7 +1244,7 @@ void SensorsHidlTest::testBatchingOperation(SensorType type) {
  }

  // at least reach 90% of advertised capacity
  ASSERT_GT(nEvent, (size_t)(batchingPeriodInNs / minSamplingPeriodInNs * 9 / 10));
  ASSERT_GT(nEvent, (size_t)(minFifoCount * 9 / 10));
}

// Test if sensor hal can do accelerometer batching properly