Mercurial > lbo > hg > syslog

changeset 26:071e6d446dbd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move tests for rule into right module
author Lewin Bormann <lbo@spheniscida.de>
date Sun, 04 Dec 2016 17:47:36 +0100
parents feacaba90cbe
children ceb9bd6d94e2
files src/config.rs src/rule.rs
diffstat 2 files changed, 20 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/config.rs	Sun Dec 04 17:47:15 2016 +0100
+++ b/src/config.rs	Sun Dec 04 17:47:36 2016 +0100
@@ -12,7 +12,6 @@
 use dns_lookup;
 use toml;
 
-use priority;
 use rule::{self, Rule};
 
 /// Parses strings like 0/1s/2m/3h/4d/5w and returns seconds. If no unit is there, seconds is
@@ -384,23 +383,6 @@
     use super::*;
 
     #[test]
-    fn test_config_matcher_parse() {
-        let m = "mail,news.info,warn;kern.=warn;syslog.warn;daemon.debug,info,warn";
-        assert_eq!(format!("{:?}", super::parse_matcher(m)),
-                   "Ok([(MultiFacility([NEWS, LOCAL0]), MultiLevel([WARNING, NONE])), \
-                    (Facility(KERN), ExactLevel(WARNING)), (Facility(SYSLOG), Level(WARNING)), \
-                    (Facility(DAEMON), MultiLevel([WARNING, NONE, NONE]))])");
-
-        let m = "mail, news.info; kern.warn";
-
-        assert_eq!(format!("{:?}", super::parse_matcher(m)),
-                   "Ok([(MultiFacility([NEWS, LOCAL0]), Level(INFO)), (Facility(KERN), \
-                    Level(WARNING))])");
-
-        assert_eq!(format!("{:?}", super::parse_matcher("")), "Ok([])");
-    }
-
-    #[test]
     fn test_config_duration_parse() {
         use super::parse_duration;
 
--- a/src/rule.rs	Sun Dec 04 17:47:15 2016 +0100
+++ b/src/rule.rs	Sun Dec 04 17:47:36 2016 +0100
@@ -167,3 +167,23 @@
         stop: stop
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_config_matcher_parse() {
+        let m = "mail,news.info,warn;kern.=warn;syslog.warn;daemon.debug,info,warn";
+        assert_eq!(format!("{:?}", super::parse_matcher(m)),
+                   "Ok([(MultiFacility([NEWS, LOCAL0]), MultiLevel([WARNING, NONE])), \
+                    (Facility(KERN), ExactLevel(WARNING)), (Facility(SYSLOG), Level(WARNING)), \
+                    (Facility(DAEMON), MultiLevel([WARNING, NONE, NONE]))])");
+
+        let m = "mail, news.info; kern.warn";
+
+        assert_eq!(format!("{:?}", super::parse_matcher(m)),
+                   "Ok([(MultiFacility([NEWS, LOCAL0]), Level(INFO)), (Facility(KERN), \
+                    Level(WARNING))])");
+
+        assert_eq!(format!("{:?}", super::parse_matcher("")), "Ok([])");
+    }
+}