Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2025-01-16 10:51:19 -08:00
parent a345bac309
commit 2cb7714e76
7 changed files with 10 additions and 10 deletions

View File

@ -60,7 +60,7 @@ impl Task for FakeServer {
async fn main() { async fn main() {
simple_logger::SimpleLogger::new().init().unwrap(); simple_logger::SimpleLogger::new().init().unwrap();
let tservice = create_task(Arc::new(FakeServer::new())); let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
let mut server = Server::new() let mut server = Server::new()
.bind("unix:///tmp/shim-proto-ttrpc-001") .bind("unix:///tmp/shim-proto-ttrpc-001")

View File

@ -57,7 +57,7 @@ impl Task for FakeServer {
fn main() { fn main() {
simple_logger::SimpleLogger::new().init().unwrap(); simple_logger::SimpleLogger::new().init().unwrap();
let tservice = create_task(Arc::new(FakeServer::new())); let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
let mut server = Server::new() let mut server = Server::new()
.bind("unix:///tmp/shim-proto-ttrpc-001") .bind("unix:///tmp/shim-proto-ttrpc-001")

View File

@ -72,7 +72,7 @@ fn create_ttrpc_context() -> (
#[test] #[test]
fn test_task_method_num() { fn test_task_method_num() {
let task = create_task(Arc::new(FakeServer::new())); let task = create_task(Arc::new(Box::new(FakeServer::new())));
assert_eq!(task.len(), 17); assert_eq!(task.len(), 17);
} }
@ -96,7 +96,7 @@ fn test_create_task() {
request.set_timeout_nano(10000); request.set_timeout_nano(10000);
request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone())); request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));
let task = create_task(Arc::new(FakeServer::new())); let task = create_task(Arc::new(Box::new(FakeServer::new())));
let create = task.get("/containerd.task.v2.Task/Create").unwrap(); let create = task.get("/containerd.task.v2.Task/Create").unwrap();
create.handler(ctx, request).unwrap(); create.handler(ctx, request).unwrap();
@ -137,7 +137,7 @@ fn test_delete_task() {
request.set_timeout_nano(10000); request.set_timeout_nano(10000);
request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone())); request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));
let task = create_task(Arc::new(FakeServer::new())); let task = create_task(Arc::new(Box::new(FakeServer::new())));
let delete = task.get("/containerd.task.v2.Task/Delete").unwrap(); let delete = task.get("/containerd.task.v2.Task/Delete").unwrap();
delete.handler(ctx, request).unwrap(); delete.handler(ctx, request).unwrap();

View File

@ -178,7 +178,7 @@ where
let publisher = RemotePublisher::new(&ttrpc_address).await?; let publisher = RemotePublisher::new(&ttrpc_address).await?;
let task = shim.create_task_service(publisher).await; let task = shim.create_task_service(publisher).await;
let task_service = create_task(Arc::new(task)); let task_service = create_task(Arc::new(Box::new(task)));
let mut server = Server::new().register_service(task_service); let mut server = Server::new().register_service(task_service);
server = server.add_listener(SOCKET_FD)?; server = server.add_listener(SOCKET_FD)?;
server = server.set_domain_unix(); server = server.set_domain_unix();

View File

@ -218,7 +218,7 @@ mod tests {
let barrier2 = barrier.clone(); let barrier2 = barrier.clone();
let server_thread = tokio::spawn(async move { let server_thread = tokio::spawn(async move {
let listener = UnixListener::bind(&path1).unwrap(); let listener = UnixListener::bind(&path1).unwrap();
let service = create_events(Arc::new(server)); let service = create_events(Arc::new(Box::new(server)));
let mut server = Server::new() let mut server = Server::new()
.set_domain_unix() .set_domain_unix()
.add_listener(listener.as_raw_fd()) .add_listener(listener.as_raw_fd())

View File

@ -266,7 +266,7 @@ where
let publisher = publisher::RemotePublisher::new(&ttrpc_address)?; let publisher = publisher::RemotePublisher::new(&ttrpc_address)?;
let task = shim.create_task_service(publisher); let task = shim.create_task_service(publisher);
let task_service = create_task(Arc::new(task)); let task_service = create_task(Arc::new(Box::new(task)));
let mut server = create_server(flags)?; let mut server = create_server(flags)?;
server = server.register_service(task_service); server = server.register_service(task_service);
server.start()?; server.start()?;

View File

@ -188,7 +188,7 @@ mod tests {
use std::os::unix::{io::AsRawFd, net::UnixListener}; use std::os::unix::{io::AsRawFd, net::UnixListener};
let listener = UnixListener::bind(server_address).unwrap(); let listener = UnixListener::bind(server_address).unwrap();
listener.set_nonblocking(true).unwrap(); listener.set_nonblocking(true).unwrap();
let service = client::create_events(Arc::new(FakeServer {})); let service = client::create_events(Arc::new(Box::new(FakeServer {})));
let server = Server::new() let server = Server::new()
.add_listener(listener.as_raw_fd()) .add_listener(listener.as_raw_fd())
.unwrap() .unwrap()
@ -199,7 +199,7 @@ mod tests {
#[cfg(windows)] #[cfg(windows)]
{ {
let service = client::create_events(Arc::new(FakeServer {})); let service = client::create_events(Arc::new(Box::new(FakeServer {})));
Server::new() Server::new()
.bind(server_address) .bind(server_address)