summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-05-08 03:09:52 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-05-08 03:09:52 +0000
commit1f9f21ac0e3f00a0dfc90a34439feb41f8e16ab8 (patch)
tree2cf25ca2aeaf692e4c3d7efbcf1daaa0ba9ec282
parent86b9309b0413639241a012ce85d509f46c5f792a (diff)
parent3e30810eff0862f1ef86b207e7792728cb09bd96 (diff)
downloadnetd-1f9f21ac0e3f00a0dfc90a34439feb41f8e16ab8.tar.gz
Snap for 7347062 from 3e30810eff0862f1ef86b207e7792728cb09bd96 to sc-release
Change-Id: I84a54f6ca5fff86025a1282d5266226d27e972fc
-rw-r--r--tests/netlink_listener_test.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/netlink_listener_test.cpp b/tests/netlink_listener_test.cpp
index f2d60344..249bdfbe 100644
--- a/tests/netlink_listener_test.cpp
+++ b/tests/netlink_listener_test.cpp
@@ -157,7 +157,10 @@ TEST_F(NetlinkListenerTest, TestAllSocketUntagged) {
checkMassiveSocketDestroy(100, false);
}
-TEST_F(NetlinkListenerTest, TestSkDestroyError) {
+// Disabled because flaky on blueline-userdebug; this test relies on the main thread
+// winning a race against the NetlinkListener::run() thread. There's no way to ensure
+// things will be scheduled the same way across all architectures and test environments.
+TEST_F(NetlinkListenerTest, DISABLED_TestSkDestroyError) {
bool needRetry = false;
int retryCount = 0;
do {