summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-12-30 01:26:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-30 01:26:19 +0000
commita31cc835b23b28b7cd7c5c141e23bb80d20e6454 (patch)
tree5d376d345073642c692af5ecc96b4599e42fe18c
parent290569d973e1c449de4be83200e642a9a90f8922 (diff)
parent99abfd276063ab3a7748939aa55e107aaca903f6 (diff)
downloadtests-a31cc835b23b28b7cd7c5c141e23bb80d20e6454.tar.gz
net-test: bpf_test - deflake an assert am: 99abfd2760
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2892720 Change-Id: Ic255d313154d419158c15390f06fa1f6d53a9559 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xnet/test/bpf_test.py3
1 files changed, 2 insertions, 1 deletions
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