diff --git a/src/agent/src/config.rs b/src/agent/src/config.rs index 759b696c4e..0bdf20c2dc 100644 --- a/src/agent/src/config.rs +++ b/src/agent/src/config.rs @@ -432,6 +432,8 @@ fn get_container_pipe_size(param: &str) -> Result { #[cfg(test)] mod tests { + use crate::assert_result; + use super::*; use anyhow::anyhow; use std::fs::File; @@ -439,32 +441,6 @@ mod tests { use std::time; use tempfile::tempdir; - // Parameters: - // - // 1: expected Result - // 2: actual Result - // 3: string used to identify the test on error - macro_rules! assert_result { - ($expected_result:expr, $actual_result:expr, $msg:expr) => { - if $expected_result.is_ok() { - let expected_level = $expected_result.as_ref().unwrap(); - let actual_level = $actual_result.unwrap(); - assert!(*expected_level == actual_level, "{}", $msg); - } else { - let expected_error = $expected_result.as_ref().unwrap_err(); - let expected_error_msg = format!("{:?}", expected_error); - - if let Err(actual_error) = $actual_result { - let actual_error_msg = format!("{:?}", actual_error); - - assert!(expected_error_msg == actual_error_msg, "{}", $msg); - } else { - assert!(expected_error_msg == "expected error, got OK", "{}", $msg); - } - } - }; - } - #[test] fn test_new() { let config: AgentConfig = Default::default(); diff --git a/src/agent/src/rpc.rs b/src/agent/src/rpc.rs index f100e0c439..94e3879b93 100644 --- a/src/agent/src/rpc.rs +++ b/src/agent/src/rpc.rs @@ -1894,37 +1894,11 @@ fn load_kernel_module(module: &protocols::agent::KernelModule) -> Result<()> { #[cfg(test)] mod tests { use super::*; - use crate::{namespace::Namespace, protocols::agent_ttrpc::AgentService as _}; + use crate::{assert_result, namespace::Namespace, protocols::agent_ttrpc::AgentService as _}; use oci::{Hook, Hooks, Linux, LinuxNamespace}; use tempfile::{tempdir, TempDir}; use ttrpc::{r#async::TtrpcContext, MessageHeader}; - // Parameters: - // - // 1: expected Result - // 2: actual Result - // 3: string used to identify the test on error - macro_rules! assert_result { - ($expected_result:expr, $actual_result:expr, $msg:expr) => { - if $expected_result.is_ok() { - let expected_level = $expected_result.as_ref().unwrap(); - let actual_level = $actual_result.unwrap(); - assert!(*expected_level == actual_level, "{}", $msg); - } else { - let expected_error = $expected_result.as_ref().unwrap_err(); - let expected_error_msg = format!("{:?}", expected_error); - - if let Err(actual_error) = $actual_result { - let actual_error_msg = format!("{:?}", actual_error); - - assert!(expected_error_msg == actual_error_msg, "{}", $msg); - } else { - assert!(expected_error_msg == "expected error, got OK", "{}", $msg); - } - } - }; - } - fn mk_ttrpc_context() -> TtrpcContext { TtrpcContext { fd: -1, diff --git a/src/agent/src/test_utils.rs b/src/agent/src/test_utils.rs index f8f2d7ab31..becb845fa7 100644 --- a/src/agent/src/test_utils.rs +++ b/src/agent/src/test_utils.rs @@ -53,4 +53,29 @@ mod test_utils { } }; } + + // Parameters: + // + // 1: expected Result + // 2: actual Result + // 3: string used to identify the test on error + #[macro_export] + macro_rules! assert_result { + ($expected_result:expr, $actual_result:expr, $msg:expr) => { + if $expected_result.is_ok() { + let expected_value = $expected_result.as_ref().unwrap(); + let actual_value = $actual_result.unwrap(); + assert!(*expected_value == actual_value, "{}", $msg); + } else { + assert!($actual_result.is_err(), "{}", $msg); + + let expected_error = $expected_result.as_ref().unwrap_err(); + let expected_error_msg = format!("{:?}", expected_error); + + let actual_error_msg = format!("{:?}", $actual_result.unwrap_err()); + + assert!(expected_error_msg == actual_error_msg, "{}", $msg); + } + }; + } }