diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-23 21:48:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 21:48:14 +0000 |
| commit | 05ad5dcbce1ac67803a4f38224914852903154a6 (patch) | |
| tree | 524643d4f51c2ae165b072464d3f1add55a6a8d8 | |
| parent | 19e285a4a85267dc51a712f777acf081828ec35a (diff) | |
| parent | 092e8067d427d7083e6833f9b186b77874401114 (diff) | |
| download | tests-05ad5dcbce1ac67803a4f38224914852903154a6.tar.gz | |
Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077
Change-Id: I0b990e432964a9ddcb783eb47fb2cc33abc4081a
| -rwxr-xr-x | net/test/xfrm_tunnel_test.py | 2 |
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 |