summaryrefslogtreecommitdiff
path: root/net/test/sock_diag_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'net/test/sock_diag_test.py')
-rwxr-xr-xnet/test/sock_diag_test.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/net/test/sock_diag_test.py b/net/test/sock_diag_test.py
index 39ace4c..beda5e4 100755
--- a/net/test/sock_diag_test.py
+++ b/net/test/sock_diag_test.py
@@ -562,7 +562,23 @@ class TcpRcvWindowTest(tcp_test.TcpBaseTest, SockDiagBaseTest):
self.assertRaisesErrno(ENOENT, open, self.TCP_DEFAULT_INIT_RWND, "w")
return
- f = open(self.TCP_DEFAULT_INIT_RWND, "w")
+ try:
+ f = open(self.TCP_DEFAULT_INIT_RWND, "w")
+ except IOError as e:
+ # sysctl was namespace-ified on May 25, 2020 in android-4.14-stable [R]
+ # just after 4.14.181 by:
+ # https://android-review.googlesource.com/c/kernel/common/+/1312623
+ # ANDROID: namespace'ify tcp_default_init_rwnd implementation
+ # But that commit might be missing in Q era kernels even when > 4.14.181
+ # when running T vts.
+ if net_test.LINUX_VERSION >= (4, 15, 0):
+ raise
+ if e.errno != ENOENT:
+ raise
+ # we rely on the network namespace creation code
+ # modifying the root netns sysctl before the namespace is even created
+ return
+
f.write("60")
def checkInitRwndSize(self, version, netid):