petri: remove stale test markers before running test

petri/src/test.rs

@@ -27,6 +27,7 @@ use crate::TestArtifacts;
 use crate::requirements::HostContext;
 use crate::requirements::TestCaseRequirements;
 use crate::requirements::can_run_test_with_context;
+use crate::tracing::clear_test_result_markers;
 use crate::tracing::try_init_tracing;
 use anyhow::Context as _;
 use petri_artifacts_core::ArtifactResolver;
@@ -147,6 +148,8 @@ impl Test {
         let artifacts = resolve(&name, self.artifact_requirements.clone())
             .context("failed to resolve artifacts")?;
         let output_dir = artifacts.get(petri_artifacts_common::artifacts::TEST_LOG_DIRECTORY);
+        clear_test_result_markers(output_dir)
+            .context("failed to clear stale test result markers")?;
         let logger = try_init_tracing(output_dir, tracing::level_filters::LevelFilter::DEBUG)
             .context("failed to initialize tracing")?;
         let mut post_test_hooks = Vec::new();

petri/src/tracing.rs

@@ -25,6 +25,24 @@ use tracing_subscriber::fmt::format::FmtSpan;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 
+const PETRI_PASSED: &str = "petri.passed";
+const PETRI_FAILED_UNSTABLE: &str = "petri.failed_unstable";
+const PETRI_FAILED: &str = "petri.failed";
+const TEST_RESULT_MARKERS: &[&str] = &[PETRI_PASSED, PETRI_FAILED_UNSTABLE, PETRI_FAILED];
+
+/// Clears stale Petri test result markers from a test output directory.
+pub(crate) fn clear_test_result_markers(root_path: &Path) -> anyhow::Result<()> {
+    for &marker in TEST_RESULT_MARKERS {
+        let path = root_path.join(marker);
+        match fs_err::remove_file(&path) {
+            Ok(()) => {}
+            Err(err) if err.kind() == std::io::ErrorKind::NotFound => {}
+            Err(err) => return Err(err.into()),
+        }
+    }
+    Ok(())
+}
+
 /// A source of [`PetriLogFile`] log files for test output.
 #[derive(Clone, Debug)]
 pub struct PetriLogSource(Arc<LogSourceInner>);
@@ -136,21 +154,21 @@ impl PetriLogSource {
         let result_path = match &r {
             Ok(()) => {
                 tracing::info!("test passed");
-                "petri.passed"
+                PETRI_PASSED
             }
             Err(err) if unstable => {
                 tracing::warn!(
                     error = err.as_ref() as &dyn std::error::Error,
                     "unstable test failed"
                 );
-                "petri.failed_unstable"
+                PETRI_FAILED_UNSTABLE
             }
             Err(err) => {
                 tracing::error!(
                     error = err.as_ref() as &dyn std::error::Error,
                     "test failed"
                 );
-                "petri.failed"
+                PETRI_FAILED
             }
         };
         // Write a file to the output directory to indicate whether the test
@@ -457,4 +475,18 @@ mod tests {
         assert_eq!(kernel_level_to_tracing_level(8), Level::INFO);
         assert_eq!(kernel_level_to_tracing_level(255), Level::INFO);
     }
+
+    #[test]
+    fn clear_test_result_markers_removes_all_markers() {
+        let dir = tempfile::tempdir().unwrap();
+        for marker in TEST_RESULT_MARKERS {
+            fs_err::write(dir.path().join(marker), "test").unwrap();
+        }
+
+        clear_test_result_markers(dir.path()).unwrap();
+
+        for marker in TEST_RESULT_MARKERS {
+            assert!(!dir.path().join(marker).exists());
+        }
+    }
 }