From 99abfd276063ab3a7748939aa55e107aaca903f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Fri, 29 Dec 2023 19:26:07 +0000 Subject: net-test: bpf_test - deflake an assert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's a very very small chance that prog_fd + 1 is already occupied by some previously allocated file descriptor (likely a leaked one...) Bug: 304292059 Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I81d99ab464cde734f4d5c2b8daa80227c2712ae1 --- net/test/bpf_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/test/bpf_test.py b/net/test/bpf_test.py index 0b65c32..4602515 100755 --- a/net/test/bpf_test.py +++ b/net/test/bpf_test.py @@ -628,7 +628,8 @@ class BpfCgroupTest(net_test.NetworkTest): fd = BpfProgGetFdById(BpfProgQuery(self._cg_fd, BPF_CGROUP_INET_SOCK_CREATE, 0, 0)) assert fd is not None - assert fd == self.prog_fd + 1 + # equality while almost certain is not actually 100% guaranteed: + assert fd >= self.prog_fd + 1 os.close(fd) fd = None -- cgit v1.2.3