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

Commit 863c5244 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix flakiness of sensor VTS test cases" into oreo-dev

parents c5103e68 25e47b17

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+9 −8
Original line number Diff line number Diff line
@@ -1180,16 +1180,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);
@@ -1202,7 +1203,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
@@ -1223,7 +1224,7 @@ TEST_F(SensorsHidlTest, MagnetometerBatchingOperation) { 
void SensorsHidlTest::testDirectReportOperation(

    SensorType type, SharedMemType memType, RateLevel rate, const SensorEventsChecker &checker) {

  constexpr size_t kEventSize = static_cast<size_t>(SensorsEventFormatOffset::TOTAL_LENGTH);

  constexpr size_t kNEvent = 500;

  constexpr size_t kNEvent = 4096;

  constexpr size_t kMemSize = kEventSize * kNEvent;



  constexpr float kNormalNominal = 50;