Use blocking sockets with timeout for xfrm_tunnel_test
Using non-blocking sockets appears to be causing flakiness due to the
tests racing against the kernel's crypto/networking infrastructure.
This commit allows these sockets to block for up to 500ms to allow time
for the crypto and routing to complete before throwing errors.
Bug: 118753529
Test: Run 20x locally, via QEMU; passing.
Change-Id: I92a39f8890244ebe918f48bcf0971e85795b2a1e
diff --git a/net/test/xfrm_tunnel_test.py b/net/test/xfrm_tunnel_test.py
index 89b7c58..bf32ffc 100755
--- a/net/test/xfrm_tunnel_test.py
+++ b/net/test/xfrm_tunnel_test.py
@@ -112,7 +112,7 @@
# The second parameter of the tuple is the port number regardless of AF.
local_port = read_sock.getsockname()[1]
# Guard against the eventuality of the receive failing.
- net_test.SetNonBlocking(read_sock.fileno())
+ csocket.SetSocketTimeout(read_sock, 500)
return read_sock, local_port
