summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedict Wong <benedictwong@google.com>2018-02-11 21:39:35 -0800
committerBenedict Wong <benedictwong@google.com>2018-03-23 12:13:19 -0700
commit5d59332e11fa451f22bb3d07f5d5a372b8679195 (patch)
tree6033786ef19eba07ec1b65ccc60ff86403832602
parent059f098b7e0f77718177713cc776369ac7b0faf2 (diff)
downloadtests-5d59332e11fa451f22bb3d07f5d5a372b8679195.tar.gz
Enable algorithm net tests for 3.18 kernels
With the backport of 00bc0ef, 3.18 kernels no longer hang on the xfrm algorithm tests. This patch re-enables these tests for all 3.18 kernels. Bug: 63589559 Test: All kernel tests run, passing. Merged-In: I27b7e463a5566b1211ef6248f9239a52ff39d50d Change-Id: I27b7e463a5566b1211ef6248f9239a52ff39d50d (cherry picked from commit 2ab89c98a1431747fd2c1a2912732c26ba4c1124)
-rwxr-xr-xnet/test/xfrm_algorithm_test.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/test/xfrm_algorithm_test.py b/net/test/xfrm_algorithm_test.py
index 1de6e4b..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."""