From f7fa56ecfdc19db453ae005fafc76589ebfebc91 Mon Sep 17 00:00:00 2001 From: Jussi Saurio Date: Wed, 11 Jun 2025 14:59:30 +0300 Subject: [PATCH] Change integrity check failure to say 'simulation failed:' our AWS nightly sim looks for a line 'simulation failed:' in the process output to capture context for the github issues it creates. if the sim passes otherwise but integrity check fails, then this log line must also be present there, otherwise the aws sim will panic due to not finding a suitable line. --- simulator/main.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/simulator/main.rs b/simulator/main.rs index 2feb1bfc8..7339f8ad7 100644 --- a/simulator/main.rs +++ b/simulator/main.rs @@ -167,9 +167,10 @@ fn testing_main(cli_opts: &SimulatorCLI) -> anyhow::Result<()> { }; if let Err(err) = integrity_check(&paths.db) { - tracing::error!("Integrity Check failed:\n{}", err); + tracing::error!("simulation failed: integrity check failed:\n{}", err); if result.is_err() { - result = result.with_context(|| anyhow!("Integrity Check failed:\n{}", err)); + result = result + .with_context(|| anyhow!("simulation failed: integrity check failed:\n{}", err)); } else { result = Err(err); } @@ -761,14 +762,14 @@ fn integrity_check(db_path: &Path) -> anyhow::Result<()> { result.push(row.get(0)?); } if result.is_empty() { - anyhow::bail!("integrity_check should return `ok` or a list of problems") + anyhow::bail!("simulation failed: integrity_check should return `ok` or a list of problems") } if !result[0].eq_ignore_ascii_case("ok") { // Build a list of problems result .iter_mut() .for_each(|row| *row = format!("- {}", row)); - anyhow::bail!(result.join("\n")) + anyhow::bail!("simulation failed: {}", result.join("\n")) } Ok(()) }