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
7 changes: 5 additions & 2 deletions gateway/tests/integration_tests/serial_console.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ async fn serial_console_communication() {
Message::Binary(msg_from_sp)
);
}

testctx.teardown().await;
}

#[tokio::test]
async fn serial_console_detach() {
let testctx =
setup::test_setup("serial_console_communication", SpPort::One).await;
let testctx = setup::test_setup("serial_console_detach", SpPort::One).await;
let client = &testctx.client;
let simrack = &testctx.simrack;

Expand Down Expand Up @@ -185,4 +186,6 @@ async fn serial_console_detach() {
ws.next().await.unwrap().unwrap(),
Message::Binary(b"world".to_vec())
);

testctx.teardown().await;
}
5 changes: 5 additions & 0 deletions nexus/src/db/datastore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3158,6 +3158,7 @@ mod test {
assert_eq!(0, disk1_datasets.intersection(&disk2_datasets).count());

let _ = db.cleanup().await;
logctx.cleanup_successful();
}

#[tokio::test]
Expand Down Expand Up @@ -3224,6 +3225,7 @@ mod test {
}

let _ = db.cleanup().await;
logctx.cleanup_successful();
}

#[tokio::test]
Expand Down Expand Up @@ -3272,6 +3274,7 @@ mod test {
assert!(matches!(err, Error::ServiceUnavailable { .. }));

let _ = db.cleanup().await;
logctx.cleanup_successful();
}

// TODO: This test should be updated when the correct handling
Expand Down Expand Up @@ -3318,6 +3321,7 @@ mod test {
datastore.region_allocate(&opctx, volume1_id, &params).await.unwrap();

let _ = db.cleanup().await;
logctx.cleanup_successful();
}

// Validate that queries which should be executable without a full table
Expand Down Expand Up @@ -3376,6 +3380,7 @@ mod test {
);

let _ = db.cleanup().await;
logctx.cleanup_successful();
}

// Test sled-specific IPv6 address allocation
Expand Down
3 changes: 3 additions & 0 deletions nexus/src/db/explain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ mod test {
)
.await
.unwrap();
logctx.cleanup_successful();
}

// Tests the ".explain_async()" method in an asynchronous context.
Expand All @@ -211,6 +212,7 @@ mod test {
.unwrap();

assert_contents("tests/output/test-explain-output", &explanation);
logctx.cleanup_successful();
}

// Tests that ".explain()" can tell us when we're doing full table scans.
Expand All @@ -236,5 +238,6 @@ mod test {
"Expected [{}] to contain 'FULL SCAN'",
explanation
);
logctx.cleanup_successful();
}
}
1 change: 1 addition & 0 deletions nexus/src/db/lookup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -617,5 +617,6 @@ mod test {
} if *o == org_id && **p == project_name));

db.cleanup().await.unwrap();
logctx.cleanup_successful();
}
}
1 change: 1 addition & 0 deletions nexus/tests/integration_tests/updates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ async fn test_update_end_to_end() {

server.close().await.expect("failed to shut down dropshot server");
cptestctx.teardown().await;
logctx.cleanup_successful();
}

// =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
Expand Down