commit 2aef4b48f0be3db69e5cee9006bdf3cecc662e91
author Peng Xu <pengxu@google.com> Fri Aug 18 17:50:57 2017 -0700
committer Peng Xu <pengxu@google.com> Tue Sep 19 12:08:48 2017 -0700
tree 389043b995ca3a550f223d217ce53b142cd0e36b
parent 9dc12843882449e9e44aca5651cfa0a4e9c5b616

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

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

diff --git a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp
index 19265c2..d3323e1 100644
--- a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp
+++ b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp
@@ -1221,16 +1221,17 @@
   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 @@
   }
 
   // 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