diff --git a/tests/docker/src/lib.rs b/tests/docker/src/lib.rs index 22e1367a..a4c29bbd 100644 --- a/tests/docker/src/lib.rs +++ b/tests/docker/src/lib.rs @@ -117,16 +117,18 @@ pub fn build(name: String) { println!("Building {}...", &name); - assert!(Command::new("docker") + let res = Command::new("docker") .current_dir(deploy_path) .arg("compose") .arg("build") .arg(&name) - .spawn() - .unwrap() - .wait() - .unwrap() - .success()); + .output() + .unwrap(); + if !res.status.success() { + dbg!(res.stdout); + dbg!(res.stderr); + panic!("failed to build {name}"); + } println!("Built!"); diff --git a/tests/processor/src/lib.rs b/tests/processor/src/lib.rs index 6fc9d677..d0792bed 100644 --- a/tests/processor/src/lib.rs +++ b/tests/processor/src/lib.rs @@ -15,14 +15,6 @@ const RPC_PASS: &str = "seraidex"; static UNIQUE_ID: OnceLock> = OnceLock::new(); -fn log_options() -> Option { - Some(LogOptions { - action: LogAction::Forward, - policy: LogPolicy::Always, - source: LogSource::Both, - }) -} - pub fn bitcoin_instance() -> (Composition, u16) { serai_docker_tests::build("bitcoin".to_string()); @@ -142,7 +134,11 @@ pub fn processor_stack( composition .with_start_policy(StartPolicy::Strict) .with_container_name(format!("{handle}-{}", &unique_id)) - .with_log_options(log_options()), + .with_log_options(Some(LogOptions { + action: LogAction::Forward, + policy: if handle.contains("processor") { LogPolicy::Always } else { LogPolicy::OnError }, + source: LogSource::Both, + })), ); handles.push(compositions.last().unwrap().handle()); }