diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-23 21:34:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-23 21:34:52 +0000 |
| commit | 092e8067d427d7083e6833f9b186b77874401114 (patch) | |
| tree | 524643d4f51c2ae165b072464d3f1add55a6a8d8 | |
| parent | b3880b372f92f3e9ebb07d79302c77c977c9da35 (diff) | |
| parent | 8eb09e6c541881a9eff7ebe4358463f4d3b10a83 (diff) | |
| download | kernel_tests-pie-vts-dev.tar.gz kernel_tests-pie-vts-dev.tar.bz2 kernel_tests-pie-vts-dev.zip | |
Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-devpie-vts-dev
| -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 5f243ccc..20a85847 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 |