commit e52a0ad5d8d301b2d6fbee06a8d4c43c015aa2e0
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed Dec 12 00:05:20 2018 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Wed Dec 12 00:05:20 2018 +0000
tree 27450f93a2fb15e76d92b14ac0bd2a5af3921309
parent 4e264377d266c5c5ac92490061ebff0c05f08af9
parent 2eacd483279af9c2296d7aea99594ce3425d5d7d

Snap for 5175981 from 2eacd483279af9c2296d7aea99594ce3425d5d7d to pie-vts-release

Change-Id: I752c80ab3d20d7ae7944589b534b07753f9598b4

net/test/anycast_test.py

diff --git a/net/test/anycast_test.py b/net/test/anycast_test.py
index 82130db..62d874e 100755
--- a/net/test/anycast_test.py
+++ b/net/test/anycast_test.py
@@ -93,7 +93,9 @@
     # This will hang if the kernel has the bug.
     thread = CloseFileDescriptorThread(self.tuns[netid])
     thread.start()
-    time.sleep(0.1)
+    # Wait up to 0.5 seconds for the thread to finish, but
+    # continue and fail the test if the thread hangs.
+    thread.join(0.5)
 
     # Make teardown work.
     del self.tuns[netid]