Snap for 8030399 from db5726ce9b0bb8f468334830c9b59675354dc9eb to android12-tests-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android12-tests-release

Change-Id: Ic4229a1371bf30c3c7b00c3a51df63b5e23fb991

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