From f089d53a51d42836f6e39d69465ce4b955c17a1b Mon Sep 17 00:00:00 2001 From: Kenneth Cain Date: Tue, 9 Jun 2026 15:57:03 -0400 Subject: [PATCH] DAOS-19103 test: call FI macro in rebuild tests This change covers DAOS-19103 and DAOS-19104 fixes needed for the relevant interactive and simple rebuild test cases. Add FAULT_INJECTION_REQUIRED() in tests requiring fault injection enabled, to skip cleanly (instead of hange) when run with a daos release build. faults-enabled: false Test-tag: test_daos_rebuild_simple test_daos_rebuild_interactive Skip-unit-tests: true Skip-fault-injection-test: true Skip-test-rpms: true Signed-off-by: Kenneth Cain --- src/tests/suite/daos_rebuild_interactive.c | 2 ++ src/tests/suite/daos_rebuild_simple.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/tests/suite/daos_rebuild_interactive.c b/src/tests/suite/daos_rebuild_interactive.c index b138981f557..fe03ab5111a 100644 --- a/src/tests/suite/daos_rebuild_interactive.c +++ b/src/tests/suite/daos_rebuild_interactive.c @@ -224,6 +224,8 @@ int_rebuild_many_objects_with_failure(void **state) int rc; int i; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 6)) return; diff --git a/src/tests/suite/daos_rebuild_simple.c b/src/tests/suite/daos_rebuild_simple.c index 2c3925d8b28..04b8305523a 100644 --- a/src/tests/suite/daos_rebuild_simple.c +++ b/src/tests/suite/daos_rebuild_simple.c @@ -1373,6 +1373,8 @@ rebuild_many_objects_with_failure(void **state) int rc; int i; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 6)) return; @@ -1464,6 +1466,8 @@ rebuild_object_with_csum_error(void **state) daos_size_t io_count = block_size / transfer_size; uint32_t iterations = 2; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 3)) { skip(); } @@ -1749,6 +1753,8 @@ rebuild_with_dfs_inflight_append(void **state) daos_obj_id_t oid; struct rebuild_cb_arg cb_arg; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 6)) return; @@ -1810,6 +1816,8 @@ rebuild_with_dfs_inflight_punch(void **state) struct stat st; int rc; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 6)) return; @@ -1894,6 +1902,8 @@ rebuild_with_dfs_inflight_append_punch(void **state) struct stat st; int rc; + FAULT_INJECTION_REQUIRED(); + if (!test_runable(arg, 6)) return;