From 9ce22837ed3e5c35c14781a39b80de1108789e74 Mon Sep 17 00:00:00 2001 From: Andrew Stoycos Date: Wed, 12 Jul 2023 14:13:22 -0400 Subject: [PATCH] fix loaded_programs() race in int-tests in the integration tests we recenctly switched to using our internal api to list programs. I was seeing times when this would race and panic internally (program fd was deleted by aya WHILE we were trying to get it). This ensures that the list succeeded without panicking. Signed-off-by: Andrew Stoycos --- test/integration-test/tests/load.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration-test/tests/load.rs b/test/integration-test/tests/load.rs index de076e87..482c5518 100644 --- a/test/integration-test/tests/load.rs +++ b/test/integration-test/tests/load.rs @@ -68,6 +68,7 @@ macro_rules! assert_loaded_and_linked { ($name:literal, $loaded:expr) => { for i in 0..(MAX_RETRIES + 1) { let id = loaded_programs() + .filter(|prog| prog.is_ok()) .find(|prog| prog.as_ref().unwrap().name() == $name.as_bytes()) .map(|prog| Some(prog.unwrap().id())); let mut linked = false; @@ -94,7 +95,10 @@ macro_rules! assert_loaded_and_linked { macro_rules! assert_loaded { ($name:literal, $loaded:expr) => { for i in 0..(MAX_RETRIES + 1) { - let state = loaded_programs().any(|prog| prog.unwrap().name() == $name.as_bytes()); + let state = loaded_programs() + .filter(|prog| prog.is_ok()) + .any(|prog| prog.unwrap().name() == $name.as_bytes()); + if state == $loaded { break; }