commit 3f65728583dac769685eabaa5c227409ca9bfe35
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 01 02:49:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 01 02:49:44 2023 +0000
tree 127f6110290e857a036a406c208c08dfd7ab6f12
parent c7e11a681261f6ed86ff7392e4d7e32ff15d887b
parent 224e8b0b348ab45c87a95a37958914e050b08f65

Merge "RPC binder: one more pool test flake fix" am: 594425ca17 am: 2a685e6273 am: 224e8b0b34

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2610071

Change-Id: I02425821af6e9fd75c85a6da8ee3e29fbaae59d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 505f30f..f88cfd6 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -461,8 +461,11 @@
 
     EXPECT_GE(epochMsAfter, epochMsBefore + 2 * sleepMs);
 
-    // Potential flake, but make sure calls are handled in parallel.
-    EXPECT_LE(epochMsAfter, epochMsBefore + 4 * sleepMs);
+    // Potential flake, but make sure calls are handled in parallel. Due
+    // to past flakes, this only checks that the amount of time taken has
+    // some parallelism. Other tests such as ThreadPoolGreaterThanEqualRequested
+    // check this more exactly.
+    EXPECT_LE(epochMsAfter, epochMsBefore + (numCalls - 1) * sleepMs);
 }
 
 TEST_P(BinderRpc, ThreadPoolOverSaturated) {