ENH+TST: utils/parse_relative: seconds and minutes

parse_relative in utils:
Add support for parsing seconds and minutes

Author: Sebastian Wagner

CHANGELOG.md

@@ -28,6 +28,7 @@ CHANGELOG
   - New function `list_all_bots` to list all available/installed bots as replacement for the BOTS file (#368, #552, #644, #757, #1069, #1750, PR#1751 by Sebastian Waldbauer).
   - New function `get_bots_settings` to return the effective bot parameters, with global parameters applied.
   - Removed deprecated function `create_request_session_from_bot` (PR#1997 by Sebastian Wagner, #1404).
+  - `parse_relative`: Add support for parsing minutes and seconds (PR#1857 by Sebastian Wagner).
 - `intelmq.lib.bot_debugger`:
   - Set bot's `logging_level` directly in `__init__` before the bot's initialization by changing the default value (by Sebastian Wagner).
   - Rewrite `load_configuration_patch` by adapting it to the parameter and configuration rewrite (by Sebastian Wagner).

intelmq/lib/utils.py

@@ -481,7 +481,8 @@ def error_message_from_exc(exc: Exception) -> str:
 
 
 # number of minutes in time units
-TIMESPANS = {'hour': 60, 'day': 24 * 60, 'week': 7 * 24 * 60,
+TIMESPANS = {'second': 1 / 60, 'minute': 1,
+             'hour': 60, 'day': 24 * 60, 'week': 7 * 24 * 60,
              'month': 30 * 24 * 60, 'year': 365 * 24 * 60}
 
 

intelmq/tests/lib/test_utils.py

@@ -210,13 +210,15 @@ def test_parse_relative(self):
         """Tests if parse_reltive returns the correct timespan."""
         self.assertEqual(utils.parse_relative('1 hour'), 60)
         self.assertEqual(utils.parse_relative('2\tyears'), 1051200)
+        self.assertEqual(utils.parse_relative('5 minutes'), 5)
+        self.assertEqual(utils.parse_relative('10 seconds'), 1 / 60 * 10)
 
     def test_parse_relative_raises(self):
         """Tests if parse_reltive correctly raises ValueError."""
         with self.assertRaises(ValueError):
             utils.parse_relative('1 hou')
         with self.assertRaises(ValueError):
-            utils.parse_relative('1 minute')
+            utils.parse_relative('1 µs')
 
     def test_seconds_to_human(self):
         """ Test seconds_to_human """