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
2 changes: 1 addition & 1 deletion crates/aether-cli/tests/integration/mcp_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl ServerHandler for FakeGateway {
.into()),
"demo__fail" => Ok(CallToolResult::error(vec![]).into()),
"demo__slow" => {
tokio::time::sleep(std::time::Duration::from_mins(1)).await;
std::future::pending::<()>().await;
Ok(CallToolResult::structured(json!({"done": true})).into())
}
"demo__text" => Ok(CallToolResult::success(vec![ContentBlock::text("plain")]).into()),
Expand Down
1 change: 1 addition & 0 deletions crates/aether-lspd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ libc = { workspace = true }
[dev-dependencies]
aether-lspd = { path = ".", features = ["testing"] }
tempfile = { workspace = true }
tokio = { workspace = true, features = ["test-util"] }

[[bin]]
name = "aether-lspd"
Expand Down
4 changes: 2 additions & 2 deletions crates/aether-lspd/src/daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ mod tests {
use super::*;
use tokio::time::timeout;

#[tokio::test]
#[tokio::test(start_paused = true)]
async fn idle_timeout_none_never_completes() {
let client_count = Arc::new(AtomicUsize::new(0));
let last_activity = Arc::new(RwLock::new(Instant::now()));
Expand All @@ -207,7 +207,7 @@ mod tests {
assert!(result.is_err(), "None timeout should not complete");
}

#[tokio::test]
#[tokio::test(start_paused = true)]
async fn idle_timeout_completes_when_idle_elapsed() {
let client_count = Arc::new(AtomicUsize::new(0));
let stale_activity = Instant::now()
Expand Down
4 changes: 2 additions & 2 deletions crates/aether-lspd/src/diagnostics_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ mod tests {
}
}

#[tokio::test]
#[tokio::test(start_paused = true)]
async fn wait_for_uri_fresh_waits_for_settle_window() {
let store = DiagnosticsStore::new();
let uri: Uri = "file:///test.rs".parse().unwrap();
Expand All @@ -133,7 +133,7 @@ mod tests {
assert_eq!(diags[0].diagnostics[0].message, "second");
}

#[tokio::test]
#[tokio::test(start_paused = true)]
async fn wait_for_uri_fresh_ignores_unrelated_publishes() {
let store = DiagnosticsStore::new();
let target: Uri = "file:///target.rs".parse().unwrap();
Expand Down
1 change: 1 addition & 0 deletions crates/aether-lspd/src/docs/daemon.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use std::time::Duration;
let daemon = LspDaemon::new(
PathBuf::from("/tmp/aether-lspd-1000/lsp-rust-abc123.sock"),
Some(Duration::from_secs(300)),
Duration::from_secs(120),
);
daemon.run().await?;
# Ok(())
Expand Down
3 changes: 1 addition & 2 deletions crates/mcp-utils/src/tool_gateway/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ mod tests {
#[tokio::test]
async fn dropping_server_cancels_in_flight_connections() {
use rmcp::model::CallToolRequestParams;
use std::time::Duration;
use tokio::sync::watch;

#[derive(Clone)]
Expand All @@ -258,7 +257,7 @@ mod tests {
#[tool(description = "Blocks until the connection is aborted")]
async fn slow(&self) -> String {
let _ = self.started.send(true);
tokio::time::sleep(Duration::from_mins(10)).await;
std::future::pending::<()>().await;
"done".to_string()
}
}
Expand Down