From 383be2203a36541c3f27cc41201002328f71aa0f Mon Sep 17 00:00:00 2001
From: Bin Liu <bin@hyper.sh>
Date: Sat, 30 Apr 2022 20:09:29 +0800
Subject: [PATCH] agent: Add a macro to skip a loop easier

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>
---
 src/agent/src/mount.rs      | 21 +++++----------------
 src/agent/src/test_utils.rs | 11 +++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/agent/src/mount.rs b/src/agent/src/mount.rs
index 04b3cf9eb..d4729c881 100644
--- a/src/agent/src/mount.rs
+++ b/src/agent/src/mount.rs
@@ -1018,7 +1018,7 @@ fn parse_options(option_list: Vec<String>) -> HashMap<String, String> {
 mod tests {
     use super::*;
     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 protocols::agent::FSGroup;
     use std::fs::File;
@@ -1112,11 +1112,7 @@ mod tests {
         for (i, d) in tests.iter().enumerate() {
             let msg = format!("test[{}]: {:?}", i, d);
 
-            if d.test_user == TestUserType::RootOnly {
-                skip_loop_if_not_root!(msg);
-            } else if d.test_user == TestUserType::NonRootOnly {
-                skip_loop_if_root!(msg);
-            }
+            skip_loop_by_user!(msg, d.test_user);
 
             let src: PathBuf;
             let dest: PathBuf;
@@ -1649,11 +1645,8 @@ mod tests {
 
         for (i, d) in tests.iter().enumerate() {
             let msg = format!("test[{}]: {:?}", i, d);
-            if d.test_user == TestUserType::RootOnly {
-                skip_loop_if_not_root!(msg);
-            } else if d.test_user == TestUserType::NonRootOnly {
-                skip_loop_if_root!(msg);
-            }
+
+            skip_loop_by_user!(msg, d.test_user);
 
             let drain = slog::Discard;
             let logger = slog::Logger::root(drain, o!());
@@ -1762,11 +1755,7 @@ mod tests {
 
         for (i, d) in tests.iter().enumerate() {
             let msg = format!("test[{}]: {:?}", i, d);
-            if d.test_user == TestUserType::RootOnly {
-                skip_loop_if_not_root!(msg);
-            } else if d.test_user == TestUserType::NonRootOnly {
-                skip_loop_if_root!(msg);
-            }
+            skip_loop_by_user!(msg, d.test_user);
 
             let drain = slog::Discard;
             let logger = slog::Logger::root(drain, o!());
diff --git a/src/agent/src/test_utils.rs b/src/agent/src/test_utils.rs
index 92171bad2..d25eb129d 100644
--- a/src/agent/src/test_utils.rs
+++ b/src/agent/src/test_utils.rs
@@ -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);
+            }
+        };
+    }
 }