From d453c22fc8d3db555c71b27cda2a80989be70dbd Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Thu, 9 Dec 2021 16:00:58 -0800
Subject: [PATCH] a lot of tests leave detritus in $TMPDIR

---
 nexus/src/db/collection_insert.rs             | 2 ++
 nexus/src/db/datastore.rs                     | 2 ++
 nexus/src/db/saga_recovery.rs                 | 6 ++++--
 nexus/tests/integration_tests/console_api.rs  | 1 +
 nexus/tests/integration_tests/oximeter.rs     | 1 +
 nexus/tests/integration_tests/vpc_firewall.rs | 1 +
 sled-agent/src/sim/collection.rs              | 4 ++++
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nexus/src/db/collection_insert.rs b/nexus/src/db/collection_insert.rs
index ce1fb854d42..d9d13e144d9 100644
--- a/nexus/src/db/collection_insert.rs
+++ b/nexus/src/db/collection_insert.rs
@@ -693,6 +693,7 @@ mod test {
         assert!(*not_found.lock().unwrap());
 
         db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]
@@ -757,5 +758,6 @@ mod test {
         assert_eq!(collection_rcgen, 2);
 
         db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
     }
 }
diff --git a/nexus/src/db/datastore.rs b/nexus/src/db/datastore.rs
index b5d8b72c475..2578bc0b424 100644
--- a/nexus/src/db/datastore.rs
+++ b/nexus/src/db/datastore.rs
@@ -2077,6 +2077,7 @@ mod test {
         assert!(organization_after_project_create.rcgen > organization.rcgen);
 
         let _ = db.cleanup().await;
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]
@@ -2133,5 +2134,6 @@ mod test {
         assert_eq!(delete_again, Ok(()));
 
         let _ = db.cleanup().await;
+        logctx.cleanup_successful();
     }
 }
diff --git a/nexus/src/db/saga_recovery.rs b/nexus/src/db/saga_recovery.rs
index c4fdb4fb6b6..6685a9faa61 100644
--- a/nexus/src/db/saga_recovery.rs
+++ b/nexus/src/db/saga_recovery.rs
@@ -474,7 +474,7 @@ mod test {
         // Test setup
         let logctx =
             dev::test_setup_log("test_failure_during_saga_can_be_recovered");
-        let log = logctx.log;
+        let log = logctx.log.new(o!());
         let (mut db, db_datastore) = new_db(&log).await;
         let sec_id = db::SecId(uuid::Uuid::new_v4());
         let (storage, sec_client, uctx) =
@@ -539,6 +539,7 @@ mod test {
         let sec_client = Arc::try_unwrap(sec_client).unwrap();
         sec_client.shutdown().await;
         db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]
@@ -547,7 +548,7 @@ mod test {
         let logctx = dev::test_setup_log(
             "test_successful_saga_does_not_replay_during_recovery",
         );
-        let log = logctx.log;
+        let log = logctx.log.new(o!());
         let (mut db, db_datastore) = new_db(&log).await;
         let sec_id = db::SecId(uuid::Uuid::new_v4());
         let (storage, sec_client, uctx) =
@@ -601,5 +602,6 @@ mod test {
         let sec_client = Arc::try_unwrap(sec_client).unwrap();
         sec_client.shutdown().await;
         db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
     }
 }
diff --git a/nexus/tests/integration_tests/console_api.rs b/nexus/tests/integration_tests/console_api.rs
index d31469b9730..574675c7986 100644
--- a/nexus/tests/integration_tests/console_api.rs
+++ b/nexus/tests/integration_tests/console_api.rs
@@ -211,6 +211,7 @@ async fn test_absolute_static_dir() {
         .expect("failed to get existing file");
 
     assert_eq!(resp.body, "hello there".as_bytes());
+    cptestctx.teardown().await;
 }
 
 fn get_header_value(resp: TestResponse, header_name: HeaderName) -> String {
diff --git a/nexus/tests/integration_tests/oximeter.rs b/nexus/tests/integration_tests/oximeter.rs
index fdaef0d8e0b..fb6cfc8f147 100644
--- a/nexus/tests/integration_tests/oximeter.rs
+++ b/nexus/tests/integration_tests/oximeter.rs
@@ -268,4 +268,5 @@ async fn test_oximeter_reregistration() {
         timeseries.measurements,
         new_timeseries.measurements[..timeseries.measurements.len()]
     );
+    context.teardown().await;
 }
diff --git a/nexus/tests/integration_tests/vpc_firewall.rs b/nexus/tests/integration_tests/vpc_firewall.rs
index 2c5083efbbe..73bab3ae95a 100644
--- a/nexus/tests/integration_tests/vpc_firewall.rs
+++ b/nexus/tests/integration_tests/vpc_firewall.rs
@@ -138,6 +138,7 @@ async fn test_vpc_firewall() {
             StatusCode::NOT_FOUND,
         )
         .await;
+    cptestctx.teardown().await;
 }
 
 fn is_default_firewall_rules(rules: &Vec<VpcFirewallRule>) -> bool {
diff --git a/sled-agent/src/sim/collection.rs b/sled-agent/src/sim/collection.rs
index 64b782e1455..c28f7516a02 100644
--- a/sled-agent/src/sim/collection.rs
+++ b/sled-agent/src/sim/collection.rs
@@ -443,6 +443,7 @@ mod test {
             assert!(rx.try_next().is_err());
             rprev = rnext;
         }
+        logctx.cleanup_successful();
     }
 
     /**
@@ -556,6 +557,7 @@ mod test {
         instance.transition_finish();
         let rnext = instance.object.current().clone();
         assert_eq!(rprev.gen, rnext.gen);
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]
@@ -868,6 +870,7 @@ mod test {
             assert_eq!(rnext.disk_state, next);
             rprev = rnext;
         }
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]
@@ -967,6 +970,7 @@ mod test {
         );
         disk.transition_finish();
         assert_eq!(disk.object.current().disk_state, DiskState::Destroyed);
+        logctx.cleanup_successful();
     }
 
     #[tokio::test]