github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

agent: Add a macro to skip a loop easier

Browse Source 
Add a macro to skip a loop easier without using a
if {} else {} condition check.

Fixes: #4185

Signed-off-by: Bin Liu <bin@hyper.sh>
This commit is contained in:
Bin Liu 2022-04-30 20:09:29 +08:00
parent c633780ba7
commit 383be2203a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/agent/src/mount.rs
View File

@ -1018,7 +1018,7 @@ fn parse_options(option_list: Vec<String>) -> HashMap<String, String> {
mod tests { mod tests {
use super::*; use super::*;
use crate::test_utils::test_utils::TestUserType; use crate::test_utils::test_utils::TestUserType;
use crate::{skip_if_not_root, skip_loop_if_not_root, skip_loop_if_root}; use crate::{skip_if_not_root, skip_loop_by_user, skip_loop_if_not_root, skip_loop_if_root};
use protobuf::RepeatedField; use protobuf::RepeatedField;
use protocols::agent::FSGroup; use protocols::agent::FSGroup;
use std::fs::File; use std::fs::File;
@ -1112,11 +1112,7 @@ mod tests {
for (i, d) in tests.iter().enumerate() { for (i, d) in tests.iter().enumerate() {
let msg = format!("test[{}]: {:?}", i, d); let msg = format!("test[{}]: {:?}", i, d);
if d.test_user == TestUserType::RootOnly { skip_loop_by_user!(msg, d.test_user);
skip_loop_if_not_root!(msg);
} else if d.test_user == TestUserType::NonRootOnly {
skip_loop_if_root!(msg);
}
let src: PathBuf; let src: PathBuf;
let dest: PathBuf; let dest: PathBuf;
@ -1649,11 +1645,8 @@ mod tests {
for (i, d) in tests.iter().enumerate() { for (i, d) in tests.iter().enumerate() {
let msg = format!("test[{}]: {:?}", i, d); let msg = format!("test[{}]: {:?}", i, d);
if d.test_user == TestUserType::RootOnly {
skip_loop_if_not_root!(msg); skip_loop_by_user!(msg, d.test_user);
} else if d.test_user == TestUserType::NonRootOnly {
skip_loop_if_root!(msg);
}
let drain = slog::Discard; let drain = slog::Discard;
let logger = slog::Logger::root(drain, o!()); let logger = slog::Logger::root(drain, o!());
@ -1762,11 +1755,7 @@ mod tests {
for (i, d) in tests.iter().enumerate() { for (i, d) in tests.iter().enumerate() {
let msg = format!("test[{}]: {:?}", i, d); let msg = format!("test[{}]: {:?}", i, d);
if d.test_user == TestUserType::RootOnly { skip_loop_by_user!(msg, d.test_user);
skip_loop_if_not_root!(msg);
} else if d.test_user == TestUserType::NonRootOnly {
skip_loop_if_root!(msg);
}
let drain = slog::Discard; let drain = slog::Discard;
let logger = slog::Logger::root(drain, o!()); let logger = slog::Logger::root(drain, o!());

11
src/agent/src/test_utils.rs
View File

@ -85,4 +85,15 @@ pub mod test_utils {
} }
}; };
} }
#[macro_export]
macro_rules! skip_loop_by_user {
($msg:expr, $user:expr) => {
if $user == TestUserType::RootOnly {
skip_loop_if_not_root!($msg);
} else if $user == TestUserType::NonRootOnly {
skip_loop_if_root!($msg);
}
};
}
} }