Skip to content

Stabilize MCP refresh regression tests #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrypark133 merged 1 commit into from
Mar 31, 2026
Merged

Stabilize MCP refresh regression tests #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/cli/oauth_defaults.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,10 @@ mod tests {
});
Json(json!({
"access_token": "proxy-access-token",
"token_type": "Bearer",
"refresh_token": "proxy-refresh-token",
"expires_in": 7200
"expires_in": 7200,
"scope": "scope-a scope-b"
}))
}

Expand Down
24 changes: 15 additions & 9 deletions src/tools/mcp/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,14 +2169,13 @@ mod tests {
"IRONCLAW_OAUTH_PROXY_AUTH_TOKEN",
Some("gateway-test-token"),
);
let expected_token_url = format!("{base_url}/token");

let secrets = test_secrets_store();
let user_id = "test-user";
let server = McpServerConfig::new("notion", "https://mcp.notion.com/mcp").with_oauth(
crate::tools::mcp::config::OAuthConfig::new("configured-client").with_endpoints(
"http://127.0.0.1/authorize",
"https://auth.example.com/token",
),
crate::tools::mcp::config::OAuthConfig::new("configured-client")
.with_endpoints("http://127.0.0.1/authorize", expected_token_url.clone()),
);

secrets
Expand All @@ -2202,7 +2201,7 @@ mod tests {
);
assert_eq!(
requests[0].form.get("token_url").map(String::as_str),
Some("https://auth.example.com/token")
Some(expected_token_url.as_str())
);
assert_eq!(
requests[0].form.get("provider").map(String::as_str),
Expand All @@ -2218,8 +2217,12 @@ mod tests {
);
}

#[allow(clippy::await_holding_lock)]
#[tokio::test]
async fn test_refresh_access_token_serializes_concurrent_refreshes() {
let _env_guard = lock_env();
let _proxy_url_guard = set_env_var("IRONCLAW_OAUTH_EXCHANGE_URL", None);
let _proxy_token_guard = set_env_var("IRONCLAW_OAUTH_PROXY_AUTH_TOKEN", None);
let secrets = test_secrets_store();
let user_id = "test-user";
let Some((base_url, state)) = start_refresh_server().await else {
Expand Down Expand Up @@ -2265,13 +2268,16 @@ mod tests {

#[tokio::test]
async fn test_refresh_lock_recreates_dropped_entry() {
let first = refresh_lock("notion", "user-a").await;
let first_ptr = Arc::as_ptr(&first);
let first = refresh_lock("notion-recreate", "user-recreate").await;
let first_weak = Arc::downgrade(&first);
drop(first);

let second = refresh_lock("notion", "user-a").await;
assert!(first_weak.upgrade().is_none());

let second = refresh_lock("notion-recreate", "user-recreate").await;
let third = refresh_lock("notion-recreate", "user-recreate").await;

assert_ne!(Arc::as_ptr(&second), first_ptr);
assert!(Arc::ptr_eq(&second, &third));
}

struct EnvVarGuard {
Expand Down
Loading