Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions bt-daemon/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,10 @@ pub async fn run_traced(
};
let socket = paths::socket_path(None);
match flush_managed_run(&managed_run_id, &socket, MANAGED_RUN_FLUSH_TIMEOUT_MS).await {
Ok(result) if result.accepted_sessions == 0 => {
anyhow::bail!(
"managed run produced no accepted trace events; verify hook output and `bt trace status`"
)
}
Ok(result) if result.accepted_sessions == 0 => tracing::warn!(
managed_run_id,
"managed run produced no accepted trace events"
),
Ok(result) if result.flushed => {}
Ok(result) => tracing::warn!(
managed_run_id,
Expand Down
25 changes: 22 additions & 3 deletions bt-daemon/tests/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ impl Drop for EnvVarGuard {

#[cfg(all(feature = "cli", unix))]
#[tokio::test]
async fn managed_run_flushes_after_success_failure_and_signal_exit() {
async fn managed_run_flushes_and_preserves_agent_exit_status() {
use std::os::unix::fs::PermissionsExt;

let version = env!("CARGO_PKG_VERSION");
Expand All @@ -1081,12 +1081,19 @@ for argument in "$@"; do
done
session_id=$previous
mode=$last
printf '{"session_id":"%s","hook_event_name":"SessionStart"}\n' "$session_id" |
"$BT_DAEMON_TEST_BIN" hook --source debug --managed-run-hook --no-spawn
case "$mode" in
untraced-success|untraced-failure) ;;
*)
printf '{"session_id":"%s","hook_event_name":"SessionStart"}\n' "$session_id" |
"$BT_DAEMON_TEST_BIN" hook --source debug --managed-run-hook --no-spawn
;;
esac
case "$mode" in
success) exit 0 ;;
failure) exit 7 ;;
signal) kill -TERM "$$" ;;
untraced-success) exit 0 ;;
untraced-failure) exit 7 ;;
*) exit 99 ;;
esac
"#,
Expand Down Expand Up @@ -1127,6 +1134,18 @@ esac
assert!(!signal_status.success());
assert_eq!(signal_status.code(), None);

assert!(run("managed-untraced", "untraced-success")
.await
.unwrap()
.success());
assert_eq!(
run("managed-untraced", "untraced-failure")
.await
.unwrap()
.code(),
Some(7)
);

assert_eq!(
*flushes.lock().unwrap(),
HashMap::from([
Expand Down
Loading