diff options
author | eric_kuang.rs <eric_kuang.rs@realtek.com> | 2021-12-01 11:20:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-01 11:20:19 +0000 |
commit | 4527d77bf706f239838a828bf973346204143e24 (patch) | |
tree | 427695943c0c3e8ec51dd5534595b16e6fd6b469 | |
parent | e679d78a43c9a6a94a4d23a3d3a187f780a8e66e (diff) | |
parent | 7b07e88d38aa3211f47dc1fcd360399d75514479 (diff) | |
download | tests-4527d77bf706f239838a828bf973346204143e24.tar.gz |
net-test: not supported in netns before 4.15 if BH_TIMEOUT_SYSCTL does not exist. am: 7b07e88d38
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1906374
Change-Id: Ia72fb4ebc8fbbc347360b05620a128e4a4ece53b
-rwxr-xr-x | net/test/tcp_fastopen_test.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/test/tcp_fastopen_test.py b/net/test/tcp_fastopen_test.py index 5b89a2d..9c777c6 100755 --- a/net/test/tcp_fastopen_test.py +++ b/net/test/tcp_fastopen_test.py @@ -22,6 +22,7 @@ from scapy import all as scapy import multinetwork_base import net_test +import os import packets import tcp_metrics @@ -67,6 +68,9 @@ class TcpFastOpenTest(multinetwork_base.MultiNetworkBaseTest): def clearBlackhole(self): if net_test.LINUX_VERSION < (4, 14, 0): return + # Prior to 4.15 this sysctl is not namespace aware. + if net_test.LINUX_VERSION < (4, 15, 0) and not os.path.exists(BH_TIMEOUT_SYSCTL): + return timeout = self.GetSysctl(BH_TIMEOUT_SYSCTL) # Write to timeout to clear any pre-existing blackhole condition |