summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2016-09-09 01:09:31 +0900
committerLorenzo Colitti <lorenzo@google.com>2016-09-23 06:13:03 +0000
commitf83585259a92c7edd243c3a61c59919eff2a34b1 (patch)
tree8fa280c300abd274b43626910d191b716b4e351e
parent5e67a0c07ca00f27c6bc88fd5a87a77ec31125fb (diff)
downloadkernel_tests-f83585259a92c7edd243c3a61c59919eff2a34b1.tar.gz
kernel_tests-f83585259a92c7edd243c3a61c59919eff2a34b1.tar.bz2
kernel_tests-f83585259a92c7edd243c3a61c59919eff2a34b1.zip
Enable all skipped tests in sock_diag_test.android-n-mr1-preview-2android-n-mr1-preview-1
All device trees that run kernel/tests from master should have the required commits now. Test: all_tests.sh passes on android-3.18. Change-Id: I13962c95330e92d15df7b2b26dbbd06999af2cf8
-rwxr-xr-xnet/test/sock_diag_test.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/test/sock_diag_test.py b/net/test/sock_diag_test.py
index fb1e3440..1d57c341 100755
--- a/net/test/sock_diag_test.py
+++ b/net/test/sock_diag_test.py
@@ -631,7 +631,6 @@ class SockDestroyTcpTest(tcp_test.TcpBaseTest, SockDiagBaseTest):
self.ExpectNoPacketsOn(self.netid, msg)
-@unittest.skipUnless(net_test.LINUX_VERSION >= (4, 9, 0), "does not yet exist")
class SockDestroyUdpTest(SockDiagBaseTest):
"""Tests SOCK_DESTROY on UDP sockets.
@@ -755,7 +754,6 @@ class SockDestroyPermissionTest(SockDiagBaseTest):
self.CheckPermissions(SOCK_STREAM)
-@unittest.skipUnless(net_test.LINUX_VERSION >= (4, 9, 0), "does not yet exist")
class SockDiagMarkTest(tcp_test.TcpBaseTest, SockDiagBaseTest):
"""Tests SOCK_DIAG bytecode filters that use marks.