diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-28 07:25:06 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-28 07:25:06 +0000 |
| commit | 6d2290a4ad5aa422af18637ddc0daa138bc7ce74 (patch) | |
| tree | 6033786ef19eba07ec1b65ccc60ff86403832602 | |
| parent | 9c06c7859dbc2e2ebbe888bc18d8c396a9397d69 (diff) | |
| parent | 5d59332e11fa451f22bb3d07f5d5a372b8679195 (diff) | |
| download | tests-6d2290a4ad5aa422af18637ddc0daa138bc7ce74.tar.gz | |
Snap for 4683893 from 5d59332e11fa451f22bb3d07f5d5a372b8679195 to pi-release
Change-Id: I9663b95c685b1ff3ae4d2da48e3a4e2d046c9765
| -rwxr-xr-x | net/test/xfrm_algorithm_test.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/test/xfrm_algorithm_test.py b/net/test/xfrm_algorithm_test.py index 90e7ee0..6adc461 100755 --- a/net/test/xfrm_algorithm_test.py +++ b/net/test/xfrm_algorithm_test.py @@ -136,7 +136,6 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): new_name = new_name.replace("(", "-").replace(")", "") # remove parens setattr(cls, new_name, TestClosure) - @unittest.skipIf(net_test.LINUX_VERSION[:2] == (3, 18), "b/63589559") def ParamTestSocketPolicySimple(self, params): """Test two-way traffic using transport mode and socket policies.""" @@ -252,6 +251,12 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): sock_right.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1) self.SelectInterface(sock_right, netid, "mark") + # For UDP, set SO_LINGER to 0, to prevent TCP sockets from hanging around + # in a TIME_WAIT state. + if params["proto"] == SOCK_STREAM: + net_test.DisableFinWait(sock_left) + net_test.DisableFinWait(sock_right) + # Apply the left outbound socket policy. xfrm_base.ApplySocketPolicy(sock_left, family, xfrm.XFRM_POLICY_OUT, spi_right, req_ids[0], None) @@ -320,8 +325,6 @@ class XfrmAlgorithmTest(xfrm_base.XfrmLazyTest): sock_left.send("hello request") data = sock_left.recv(2048) self.assertEquals("hello response", data) - if params["proto"] == SOCK_STREAM: - sock_left.shutdown(SHUT_RD) sock_left.close() server.join() if server_error: |