瀏覽代碼

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 <astoycos@redhat.com>
Andrew Stoycos 1 年之前
父節點
當前提交
94f554a52f
共有 1 個文件被更改,包括 11 次插入3 次删除
  1. 11 3
      test/integration-test/src/tests/load.rs

+ 11 - 3
test/integration-test/src/tests/load.rs

@@ -60,9 +60,12 @@ fn is_linked(prog_id: &u32) -> bool {
 macro_rules! assert_loaded_and_linked {
     ($name:literal, $loaded:expr) => {
         for i in 0..(MAX_RETRIES + 1) {
+            // Ignore race failures which can happen when the tests delete a
+            // program in the middle of a `loaded_programs()` call.
             let id = loaded_programs()
-                .find(|prog| prog.as_ref().unwrap().name() == $name.as_bytes())
-                .map(|prog| Some(prog.unwrap().id()));
+                .filter_map(|prog| prog.ok())
+                .find(|prog| prog.name() == $name.as_bytes())
+                .map(|prog| Some(prog.id()));
             let mut linked = false;
             if let Some(prog_id) = id {
                 linked = is_linked(&prog_id.unwrap());
@@ -87,7 +90,12 @@ 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());
+            // Ignore race failures which can happen when the tests delete a
+            // program in the middle of a `loaded_programs()` call.
+            let state = loaded_programs()
+                .filter_map(|prog| prog.ok())
+                .any(|prog| prog.name() == $name.as_bytes());
+
             if state == $loaded {
                 break;
             }