From d295de4cd59ff8c7009710e101dcb09cec03a35a Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 8 Aug 2022 13:36:05 +0100
Subject: [PATCH] option_parser: Move test_option_parser to option_parser crate

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 option_parser/src/lib.rs | 24 ++++++++++++++++++++++++
 vmm/src/config.rs        | 19 -------------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/option_parser/src/lib.rs b/option_parser/src/lib.rs
index c899397ca..b675bcb6f 100644
--- a/option_parser/src/lib.rs
+++ b/option_parser/src/lib.rs
@@ -334,3 +334,27 @@ impl FromStr for StringList {
         Ok(StringList(string_list))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_option_parser() {
+        let mut parser = OptionParser::new();
+        parser
+            .add("size")
+            .add("mergeable")
+            .add("hotplug_method")
+            .add("hotplug_size");
+
+        assert!(parser.parse("size=128M,hanging_param").is_err());
+        assert!(parser.parse("size=128M,too_many_equals=foo=bar").is_err());
+        assert!(parser.parse("size=128M,file=/dev/shm").is_err());
+        assert!(parser.parse("size=128M").is_ok());
+
+        assert_eq!(parser.get("size"), Some("128M".to_owned()));
+        assert!(!parser.is_set("mergeable"));
+        assert!(parser.is_set("size"));
+    }
+}
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 24202c805..97ba606f0 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -2692,25 +2692,6 @@ impl VmConfig {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test_option_parser() {
-        let mut parser = OptionParser::new();
-        parser
-            .add("size")
-            .add("mergeable")
-            .add("hotplug_method")
-            .add("hotplug_size");
-
-        assert!(parser.parse("size=128M,hanging_param").is_err());
-        assert!(parser.parse("size=128M,too_many_equals=foo=bar").is_err());
-        assert!(parser.parse("size=128M,file=/dev/shm").is_err());
-        assert!(parser.parse("size=128M").is_ok());
-
-        assert_eq!(parser.get("size"), Some("128M".to_owned()));
-        assert!(!parser.is_set("mergeable"));
-        assert!(parser.is_set("size"));
-    }
-
     #[test]
     fn test_cpu_parsing() -> Result<()> {
         assert_eq!(CpusConfig::parse("")?, CpusConfig::default());