Snap for 8030391 from 17a08fbb06ec8a9dc425632a0bdd90b1622d5d26 to android11-tests-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android11-tests-release

Change-Id: I0466fe96fda21754efe174f71e3367039e4da653

1 files changed, 4 insertions, 0 deletions

diff --git a/net/test/tcp_fastopen_test.py b/net/test/tcp_fastopen_test.py
index 16e41c6..3ab9e51 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