fix(rust): update tests for connection timeout changes

This commit is contained in:
t8y2 committed 2026-05-28 20:25:09 +08:00
1 parent f41601e4dc
commit fa39fb9f92
7 files changed
+13 -5

No files matched your search

+1
View File
@@ -502,6 +502,7 @@ mod tests {
ssh_key_passphrase: "key".to_string(), ssh_key_passphrase: "key".to_string(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: 5, ssh_connect_timeout_secs: 5,
connect_timeout_secs: 5,
query_timeout_secs: 30, query_timeout_secs: 30,
proxy_enabled: false, proxy_enabled: false,
proxy_type: ProxyType::Socks5, proxy_type: ProxyType::Socks5,
+7 -4
View File
@@ -885,7 +885,7 @@ mod tests {
redacted_connection_url_for_endpoint, uses_tcp_probe, AppState, PoolKind, redacted_connection_url_for_endpoint, uses_tcp_probe, AppState, PoolKind,
}; };
use crate::db; use crate::db;
use crate::models::connection::{ConnectionConfig, DatabaseType, ProxyType}; use crate::models::connection::{default_connect_timeout_secs, ConnectionConfig, DatabaseType, ProxyType};
use crate::schema; use crate::schema;
use crate::storage::Storage; use crate::storage::Storage;
@@ -914,6 +914,7 @@ mod tests {
ssh_key_passphrase: String::new(), ssh_key_passphrase: String::new(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(), ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(),
connect_timeout_secs: default_connect_timeout_secs(),
query_timeout_secs: crate::models::connection::default_query_timeout_secs(), query_timeout_secs: crate::models::connection::default_query_timeout_secs(),
proxy_enabled: false, proxy_enabled: false,
proxy_type: ProxyType::Socks5, proxy_type: ProxyType::Socks5,
@@ -1175,9 +1176,11 @@ mod tests {
async fn assert_live_postgres_like_query(config: ConnectionConfig) { async fn assert_live_postgres_like_query(config: ConnectionConfig) {
let url = connection_url_for_endpoint(&config, &config.host, config.port); let url = connection_url_for_endpoint(&config, &config.host, config.port);
let pool = db::postgres::connect(&url).await.unwrap_or_else(|err| { let pool = db::postgres::connect(&url, std::time::Duration::from_secs(config.effective_connect_timeout_secs()))
panic!("failed to connect to {:?} at {}:{}: {}", config.db_type, config.host, config.port, err) .await
}); .unwrap_or_else(|err| {
panic!("failed to connect to {:?} at {}:{}: {}", config.db_type, config.host, config.port, err)
});
let result = let result =
db::postgres::execute_query(&pool, "SELECT current_database(), current_schema()").await.unwrap_or_else( db::postgres::execute_query(&pool, "SELECT current_database(), current_schema()").await.unwrap_or_else(
|err| panic!("failed to query {:?} at {}:{}: {}", config.db_type, config.host, config.port, err), |err| panic!("failed to query {:?} at {}:{}: {}", config.db_type, config.host, config.port, err),
@@ -312,6 +312,7 @@ mod tests {
ssh_key_passphrase: String::new(), ssh_key_passphrase: String::new(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(), ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(),
connect_timeout_secs: crate::models::connection::default_connect_timeout_secs(),
query_timeout_secs: crate::models::connection::default_query_timeout_secs(), query_timeout_secs: crate::models::connection::default_query_timeout_secs(),
proxy_enabled: false, proxy_enabled: false,
proxy_type: ProxyType::Socks5, proxy_type: ProxyType::Socks5,
+1 -1
View File
@@ -1271,7 +1271,7 @@ mod tests {
#[ignore = "requires remote MariaDB with ed25519 user"] #[ignore = "requires remote MariaDB with ed25519 user"]
async fn test_ed25519_auth() { async fn test_ed25519_auth() {
let url = "mysql://edtest:test123@172.26.128.159:20026/testdb"; let url = "mysql://edtest:test123@172.26.128.159:20026/testdb";
let pool = super::connect(url).await.expect("connect with ed25519"); let pool = super::connect(url, std::time::Duration::from_secs(5)).await.expect("connect with ed25519");
let mut conn = pool.get_conn().await.expect("get connection"); let mut conn = pool.get_conn().await.expect("get connection");
conn.ping().await.expect("ping"); conn.ping().await.expect("ping");
let _ = conn.disconnect().await; let _ = conn.disconnect().await;
+1
View File
@@ -857,6 +857,7 @@ mod tests {
ssh_key_passphrase: String::new(), ssh_key_passphrase: String::new(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: default_ssh_connect_timeout_secs(), ssh_connect_timeout_secs: default_ssh_connect_timeout_secs(),
connect_timeout_secs: super::default_connect_timeout_secs(),
query_timeout_secs: default_query_timeout_secs(), query_timeout_secs: default_query_timeout_secs(),
proxy_enabled: false, proxy_enabled: false,
proxy_type: ProxyType::Socks5, proxy_type: ProxyType::Socks5,
+1
View File
@@ -1406,6 +1406,7 @@ mod tests {
ssh_key_passphrase: String::new(), ssh_key_passphrase: String::new(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: 5, ssh_connect_timeout_secs: 5,
connect_timeout_secs: 5,
query_timeout_secs: 30, query_timeout_secs: 30,
proxy_enabled: false, proxy_enabled: false,
proxy_type: ProxyType::Socks5, proxy_type: ProxyType::Socks5,
+1
View File
@@ -1246,6 +1246,7 @@ mod tests {
ssh_key_passphrase: String::new(), ssh_key_passphrase: String::new(),
ssh_expose_lan: false, ssh_expose_lan: false,
ssh_connect_timeout_secs: 5, ssh_connect_timeout_secs: 5,
connect_timeout_secs: 5,
query_timeout_secs: 30, query_timeout_secs: 30,
proxy_enabled: false, proxy_enabled: false,
proxy_type: crate::models::connection::ProxyType::Socks5, proxy_type: crate::models::connection::ProxyType::Socks5,