From 904e2ea57d07adcc91143b437bb8fb0ba2ed92c8 Mon Sep 17 00:00:00 2001
From: Ken Chen <cken@google.com>
Date: Tue, 20 Apr 2021 11:28:16 +0800
Subject: Revert "Revert "Disable flaky test
 NetlinkListenerTest#TestSkDestroyError""

This reverts commit 78ed83a285ce1394a266a3c24a9f599560b2d078.

The test still flake in several different ways even if the timeout is
extended and having retries. Disable test to avoid false alarms.

Bug: 187247002
Bug: 184991666
Bug: 174166169
Test: atest NetlinkListenerTest
Change-Id: I03a11893025ed4361db58d73aa52b951b61f0ac7
---
 tests/netlink_listener_test.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.3