From d73a5101d06977cf1466dc0d8d78f951cec7448a Mon Sep 17 00:00:00 2001
From: Parth Sane <parthsane@google.com>
Date: Mon, 30 Sep 2024 17:47:28 +0000
Subject: Fix binderCacheUnitTest: Add 50ms wait with retry

The test is flaky and sometimes the cache invalidation
doesn't happen fast enough.

Bug: 333854840
Test: atest binderCacheUnitTest
Change-Id: I38779fa55327fac0123dadb61bed5281931de5ea
---
 libs/binder/tests/binderCacheUnitTest.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libs/binder/tests/binderCacheUnitTest.cpp b/libs/binder/tests/binderCacheUnitTest.cpp
index 482d197688..be5d559d8e 100644
--- a/libs/binder/tests/binderCacheUnitTest.cpp
+++ b/libs/binder/tests/binderCacheUnitTest.cpp
@@ -149,7 +149,16 @@ TEST_F(LibbinderCacheTest, RemoveFromCacheOnServerDeath) {
     EXPECT_EQ(OK, mServiceManager->addService(kCachedServiceName, binder2));
 
     // Confirm that new service is returned instead of old.
-    sp<IBinder> result2 = mServiceManager->checkService(kCachedServiceName);
+    int retry_count = 5;
+    sp<IBinder> result2;
+    do {
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
+        if (retry_count-- == 0) {
+            break;
+        }
+        result2 = mServiceManager->checkService(kCachedServiceName);
+    } while (result2 != binder2);
+
     ASSERT_EQ(binder2, result2);
 }
 
-- 
cgit v1.2.3-59-g8ed1b