options: change timeout value format

Change the way we handle timeout format, introducing <value> + suffix
that can be:

- s: seconds
- m: minutes
- h: hours
- d: days

For example, '30m' means '30 minutes'. If no suffix is given, we threat
the input value in seconds.

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>

Author: acerv

libkirk/main.py

@@ -149,6 +149,33 @@ def _iterate_config(value: str) -> int:
     return ret
 
 
+def _time_config(data: str) -> int:
+    """
+    Return the time in seconds from '30s', '4m', '5h', '20d' format.
+    If no suffix is specified, value is considered in seconds.
+    """
+    indata = data.strip()
+
+    match = re.search(r'^(?P<value>\d+)\s*(?P<suffix>[smhd]?)$', indata)
+    if not match:
+        raise argparse.ArgumentTypeError(f"Incorrect time format '{indata}'")
+
+    value = int(match.group('value'))
+    suffix = match.group('suffix')
+
+    if not suffix or suffix == 's':
+        return value
+
+    if suffix == 'm':
+        value *= 60
+    elif suffix == 'h':
+        value *= 3600
+    elif suffix == 'd':
+        value *= 3600 * 24
+
+    return value
+
+
 def _discover_sut(path: str) -> None:
     """
     Discover new SUT implementations.
@@ -428,14 +455,14 @@ def run(cmd_args: list = None) -> None:
     parser.add_argument(
         "--suite-timeout",
         "-T",
-        type=int,
-        default=3600,
+        type=_time_config,
+        default="1h",
         help="Timeout before stopping the suite")
     parser.add_argument(
         "--exec-timeout",
         "-t",
-        type=int,
-        default=3600,
+        type=_time_config,
+        default="1h",
         help="Timeout before stopping a single execution")
     parser.add_argument(
         "--suite-iterate",