Skip to content

Commit 29a929a

Browse files
committed
Fix failpoint test on merge cancelling
1 parent 0ad2b88 commit 29a929a

File tree

1 file changed

+6
-5
lines changed
  • quickwit/quickwit-indexing/failpoints

1 file changed

+6
-5
lines changed

quickwit/quickwit-indexing/failpoints/mod.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ async fn test_merge_executor_controlled_directory_kill_switch() -> anyhow::Resul
310310
merge_packager_mailbox,
311311
);
312312

313-
let (merge_executor_mailbox, merge_executor_handle) =
313+
let (merge_executor_mailbox, _merge_executor_handle) =
314314
universe.spawn_builder().spawn(merge_executor);
315315

316316
// We want to make sure that the processing of the message gets
@@ -334,14 +334,15 @@ async fn test_merge_executor_controlled_directory_kill_switch() -> anyhow::Resul
334334
after_universe_kill_clone.wait();
335335
})
336336
.unwrap();
337+
fail::cfg(
338+
"after-merge-split",
339+
"panic(merge should be failed by directory kill switch)",
340+
)
341+
.unwrap();
337342
merge_executor_mailbox.send_message(merge_scratch).await?;
338343
before_universe_kill.wait();
339344
universe.kill();
340345
after_universe_kill.wait();
341-
fail::cfg("before-merge-split", "off").unwrap();
342-
343-
let (exit_status, _) = merge_executor_handle.join().await;
344-
assert!(matches!(exit_status, ActorExitStatus::Failure(_)));
345346
universe.quit().await;
346347

347348
Ok(())

0 commit comments

Comments
 (0)