Skip to content

Commit d73a510

Browse files
committed
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
1 parent b36f043 commit d73a510

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

libs/binder/tests/binderCacheUnitTest.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,16 @@ TEST_F(LibbinderCacheTest, RemoveFromCacheOnServerDeath) {
149149
EXPECT_EQ(OK, mServiceManager->addService(kCachedServiceName, binder2));
150150

151151
// Confirm that new service is returned instead of old.
152-
sp<IBinder> result2 = mServiceManager->checkService(kCachedServiceName);
152+
int retry_count = 5;
153+
sp<IBinder> result2;
154+
do {
155+
std::this_thread::sleep_for(std::chrono::milliseconds(50));
156+
if (retry_count-- == 0) {
157+
break;
158+
}
159+
result2 = mServiceManager->checkService(kCachedServiceName);
160+
} while (result2 != binder2);
161+
153162
ASSERT_EQ(binder2, result2);
154163
}
155164

0 commit comments

Comments
 (0)