style: 修 rustfmt 格式化差异

This commit is contained in:
2026-10-07 17:14:42 +00:00
parent 3fc6e86f64
commit 372bb80cfd
29 changed files with 250 additions and 159 deletions
+3 -10
View File
@@ -81,8 +81,7 @@ fn server_help_lists_subcommands() {
assert!(output.status.success(), "server --help 应退 0");
let stdout = String::from_utf8_lossy(&output.stdout);
for name in [
"start", "stop", "status", "health", "info", "version", "cleanup", "restart", "log", "forge",
"watchdog",
"start", "stop", "status", "health", "info", "version", "cleanup", "restart", "log", "forge", "watchdog",
] {
assert!(stdout.contains(name), "help 应列出 {name}:{stdout}");
}
@@ -124,10 +123,7 @@ fn server_control_arms_no_server_exit_1() {
let output = oxide(&["server", sub]);
assert_eq!(output.status.code(), Some(1), "{sub} 应退 1");
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(
stderr.contains("无已注册的 server"),
"{sub} 应打印无 server 提示:{stderr}"
);
assert!(stderr.contains("无已注册的 server"), "{sub} 应打印无 server 提示:{stderr}");
}
}
@@ -145,10 +141,7 @@ fn server_forge_no_server_exit_1() {
let output = oxide(&["server", "forge", "code"]);
assert_eq!(output.status.code(), Some(1), "forge 应退 1");
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(
stderr.contains("无已注册的 server"),
"forge 应打印无 server 提示:{stderr}"
);
assert!(stderr.contains("无已注册的 server"), "forge 应打印无 server 提示:{stderr}");
}
/// cleanup 退 0(幂等:有残留则清理、无残留则报无残留),事后全局路径无文件。
+3 -8
View File
@@ -53,8 +53,7 @@ fn control_client_end_to_end() {
// 状态请求:worker 池异步预热,轮询至总数不小于 1 后核对字段。
let deadline = Instant::now() + Duration::from_secs(5);
let response = loop {
let response =
send_control_request_from(&config.sidecar_path, &ServerRequest::Status).expect("状态请求应成功");
let response = send_control_request_from(&config.sidecar_path, &ServerRequest::Status).expect("状态请求应成功");
if let ServerResponse::Status { pool_total, .. } = &response {
if *pool_total >= 1 {
break response;
@@ -89,12 +88,8 @@ fn control_client_end_to_end() {
}
// 关闭请求:得确认帧,server 线程正常退出,socket 与 sidecar 文件均被删。
let response =
send_control_request_from(&config.sidecar_path, &ServerRequest::Shutdown).expect("关闭请求应成功");
assert!(
matches!(response, ServerResponse::Shutdown),
"应得关闭确认帧:{response:?}"
);
let response = send_control_request_from(&config.sidecar_path, &ServerRequest::Shutdown).expect("关闭请求应成功");
assert!(matches!(response, ServerResponse::Shutdown), "应得关闭确认帧:{response:?}");
let result = handle.join().expect("server 线程应正常退出");
assert!(result.is_ok(), "server 应正常退出:{result:?}");
assert!(!config.socket_path.exists(), "socket 文件应被删除");
+1 -5
View File
@@ -13,11 +13,7 @@ use oxide_cli::server::server::{run_server, ServerConfig, ServerError};
/// 唯一临时路径(进程号加测试名):单进程内唯一,进程间以进程号隔离。
/// worker 数取小值 2:与既有单测同口径,大值徒增预热成本。
fn unique_paths(test_name: &str) -> ServerConfig {
let dir = std::env::temp_dir().join(format!(
"oxide_server_signal_int_{}_{}",
std::process::id(),
test_name
));
let dir = std::env::temp_dir().join(format!("oxide_server_signal_int_{}_{}", std::process::id(), test_name));
std::fs::create_dir_all(&dir).expect("测试目录创建应成功");
ServerConfig {
socket_path: dir.join("server.sock"),
+1 -5
View File
@@ -13,11 +13,7 @@ use oxide_cli::server::server::{run_server, ServerConfig, ServerError};
/// 唯一临时路径(进程号加测试名):单进程内唯一,进程间以进程号隔离。
/// worker 数取小值 2:与既有单测同口径,大值徒增预热成本。
fn unique_paths(test_name: &str) -> ServerConfig {
let dir = std::env::temp_dir().join(format!(
"oxide_server_signal_term_{}_{}",
std::process::id(),
test_name
));
let dir = std::env::temp_dir().join(format!("oxide_server_signal_term_{}_{}", std::process::id(), test_name));
std::fs::create_dir_all(&dir).expect("测试目录创建应成功");
ServerConfig {
socket_path: dir.join("server.sock"),