commit 2eb00958a25f8ca2e95f269de61cc11e07d9b2ed
author Maciej Żenczykowski <maze@google.com> Mon May 15 22:34:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 15 22:34:13 2023 +0000
tree 566989ece36a4c30e8126ad41ccb3015b00a9cd1
parent 93528b8fea61225b2762a067273f46d32a9cbdf7
parent b93c40a00179aa7bd1dc5896c884b6dd2215d4ea

deflake - bump TestCloseSocketWithoutUntag 50ms test timeout to 5s am: 3bf75ef193 am: c54a66b436 am: b93c40a001

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2589931

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

netd/BpfBaseTest.cpp

diff --git a/netd/BpfBaseTest.cpp b/netd/BpfBaseTest.cpp
index 624d216..c979a7b 100644
--- a/netd/BpfBaseTest.cpp
+++ b/netd/BpfBaseTest.cpp
@@ -93,7 +93,7 @@
     ASSERT_EQ(TEST_TAG, tagResult.value().tag);
     ASSERT_EQ(0, close(sock));
     // Check map periodically until sk destroy handler have done its job.
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 1000; i++) {
         usleep(5000);  // 5ms
         tagResult = cookieTagMap.readValue(cookie);
         if (!tagResult.ok()) {
@@ -101,7 +101,7 @@
             return;
         }
     }
-    FAIL() << "socket tag still exist after 50ms";
+    FAIL() << "socket tag still exist after 5s";
 }
 
 }