feat: server 控制客户端,五控制臂真实实现加三分支错误

This commit is contained in:
2026-10-06 17:38:18 +00:00
parent 79e94dd003
commit d5a699876a
7 changed files with 475 additions and 34 deletions
+27 -2
View File
@@ -48,10 +48,13 @@ fn server_help_lists_subcommands() {
}
}
/// 八个占位臂各退 2,stderr 含 not yet implemented。
/// 三个占位臂各退 2,stderr 含 not yet implemented。
///
/// version/status/health/info/stop 五臂已由控制客户端接管(无 server 时退 1),
/// 不在此列;restart/log/forge 仍是占位。
#[test]
fn server_stub_subcommands_exit_2() {
for sub in ["stop", "status", "health", "info", "version", "restart", "log", "forge"] {
for sub in ["restart", "log", "forge"] {
let output = oxide(&["server", sub]);
assert_eq!(output.status.code(), Some(2), "{sub} 应退 2");
let stderr = String::from_utf8_lossy(&output.stderr);
@@ -59,6 +62,28 @@ fn server_stub_subcommands_exit_2() {
}
}
/// 五个控制臂无 server 时各退 1,stderr 含「无已注册的 server」提示。
///
/// 走 well-known 全局路径:先探活,存活 server 占用时 panic 不抢占。
#[test]
fn server_control_arms_no_server_exit_1() {
let _guard = WELL_KNOWN_LOCK.lock().expect("全局路径锁不应中毒");
assert!(
!sidecar::is_server_alive(&sidecar::well_known_socket_path()),
"存活 server 占用 well-known 路径,测试不抢占"
);
for sub in ["stop", "status", "health", "info", "version"] {
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}"
);
}
}
/// cleanup 退 0(幂等:有残留则清理、无残留则报无残留),事后全局路径无文件。
#[test]
fn server_cleanup_exit_0() {
+102
View File
@@ -0,0 +1,102 @@
//! server 控制客户端集成测试:真实 run_server 加五类请求响应加关闭确认加
//! 文件删除断言。
//!
//! 只用临时路径(经 `send_control_request_from` 注入),不触碰 well-known
//! 全局单例。
use std::fs;
use std::time::{Duration, Instant};
use oxide_cli::server::client::send_control_request_from;
use oxide_cli::server::protocol::{ServerRequest, ServerResponse};
use oxide_cli::server::server::{run_server, ServerConfig};
/// 临时路径配置:进程号加测试名唯一,worker 数 2,版本取构建期版本。
fn test_config(test_name: &str) -> ServerConfig {
let dir = std::env::temp_dir().join(format!("oxide_server_client_test_{}_{}", std::process::id(), test_name));
fs::create_dir_all(&dir).expect("测试目录创建应成功");
ServerConfig {
socket_path: dir.join("server.sock"),
sidecar_path: dir.join("sidecar.json"),
worker_count: 2,
version: env!("CARGO_PKG_VERSION").to_string(),
}
}
/// 后台线程起真实 run_server,等 socket 文件出现(bind 成功即就绪)。
fn start_server(config: ServerConfig) -> std::thread::JoinHandle<Result<(), oxide_cli::server::server::ServerError>> {
let server_config = config.clone();
let handle = std::thread::spawn(move || run_server(&server_config));
let deadline = Instant::now() + Duration::from_secs(10);
while !config.socket_path.exists() {
assert!(Instant::now() < deadline, "socket 文件未出现");
std::thread::sleep(Duration::from_millis(10));
}
handle
}
/// 端到端:真实 server 依次应答五类控制请求,关闭确认后线程退出、文件被删。
#[test]
fn control_client_end_to_end() {
let config = test_config("e2e");
let handle = start_server(config.clone());
// 版本请求:版本与构建期版本一致。
let response = send_control_request_from(&config.sidecar_path, &ServerRequest::Version).expect("版本请求应成功");
match response {
ServerResponse::Version { version } => {
assert_eq!(version, env!("CARGO_PKG_VERSION"), "版本应与构建期版本一致");
}
other => panic!("应得 Version 帧,实得 {other:?}"),
}
// 状态请求: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("状态请求应成功");
if let ServerResponse::Status { pool_total, .. } = &response {
if *pool_total >= 1 {
break response;
}
}
assert!(Instant::now() < deadline, "worker 池预热应完成");
std::thread::sleep(Duration::from_millis(10));
};
match response {
ServerResponse::Status { pool_available, pool_total, .. } => {
assert!(pool_available <= pool_total, "可用数应不超过总数:{pool_available}/{pool_total}");
assert!(pool_total >= 1, "总数应不小于 1:{pool_total}");
}
other => panic!("应得 Status 帧,实得 {other:?}"),
}
// 健康请求:healthy 为真。
let response = send_control_request_from(&config.sidecar_path, &ServerRequest::Health).expect("健康请求应成功");
assert!(
matches!(response, ServerResponse::Health { healthy: true }),
"healthy 应为真:{response:?}"
);
// 信息请求:socket 路径与配置一致、进程号为当前进程号。
let response = send_control_request_from(&config.sidecar_path, &ServerRequest::Info).expect("信息请求应成功");
match response {
ServerResponse::Info { socket_path, pid, .. } => {
assert_eq!(socket_path, config.socket_path.to_string_lossy().into_owned(), "socket 路径应与配置一致");
assert_eq!(pid, std::process::id(), "进程号应为当前进程号");
}
other => panic!("应得 Info 帧,实得 {other:?}"),
}
// 关闭请求:得确认帧,server 线程正常退出,socket 与 sidecar 文件均被删。
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 文件应被删除");
assert!(!config.sidecar_path.exists(), "sidecar 文件应被删除");
}