summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-24 20:05:52 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-24 20:05:52 +0000
commit9241cad6fa58737f01cc4d51eed7cf888db5373a (patch)
tree524643d4f51c2ae165b072464d3f1add55a6a8d8
parentc0092c292e71ecbc69ec6be4df6261ad4e9b3968 (diff)
parent092e8067d427d7083e6833f9b186b77874401114 (diff)
downloadtests-pie-vts-release.tar.gz
Snap for 6861531 from 092e8067d427d7083e6833f9b186b77874401114 to pie-vts-releaseandroid-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15pie-vts-release
Change-Id: I63aa08c59c6ae4414157fb47bdfdef845023ea58
-rwxr-xr-xnet/test/xfrm_tunnel_test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/xfrm_tunnel_test.py b/net/test/xfrm_tunnel_test.py
index 5f243cc..20a8584 100755
--- a/net/test/xfrm_tunnel_test.py
+++ b/net/test/xfrm_tunnel_test.py
@@ -109,7 +109,7 @@ def _CreateReceiveSock(version, port=0):
# 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