From 8b94ebd5d2de8e320039abeca5d2c1326c881676 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 20 Jun 2023 00:59:37 +0200 Subject: [PATCH 1/2] Update default `--timestamp` format --- reframe/core/runtime.py | 6 +++--- reframe/frontend/cli.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reframe/core/runtime.py b/reframe/core/runtime.py index 8048876f11..9ff0db004e 100644 --- a/reframe/core/runtime.py +++ b/reframe/core/runtime.py @@ -9,7 +9,7 @@ import os import functools -from datetime import datetime +import time import reframe.core.config as config import reframe.utility.osext as osext @@ -31,7 +31,7 @@ def __init__(self, site_config): self._site_config = site_config self._system = System.create(site_config) self._current_run = 0 - self._timestamp = datetime.now() + self._timestamp = time.localtime() def _makedir(self, *dirs, wipeout=False): ret = os.path.join(*dirs) @@ -111,7 +111,7 @@ def perflogdir(self): @property def timestamp(self): timefmt = self.site_config.get('general/0/timestamp_dirs') - return self._timestamp.strftime(timefmt) + return time.strftime(timefmt, self._timestamp) @property def output_prefix(self): diff --git a/reframe/frontend/cli.py b/reframe/frontend/cli.py index 55dc6fb73c..2592280220 100644 --- a/reframe/frontend/cli.py +++ b/reframe/frontend/cli.py @@ -285,7 +285,7 @@ def main(): envvar='RFM_SAVE_LOG_FILES', configvar='general/save_log_files' ) output_options.add_argument( - '--timestamp', action='store', nargs='?', const='%FT%T', + '--timestamp', action='store', nargs='?', const='%y%m%dT%H%M%S%z', metavar='TIMEFMT', help=('Append a timestamp to the output and stage directory prefixes ' '(default: "%%FT%%T")'), From cad41304697efc9612bf0d6a653d3b46e48181dc Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 20 Jun 2023 22:53:21 +0200 Subject: [PATCH 2/2] Fix unit tests --- unittests/test_cli.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/unittests/test_cli.py b/unittests/test_cli.py index 22d808685c..b30b838ce4 100644 --- a/unittests/test_cli.py +++ b/unittests/test_cli.py @@ -551,14 +551,17 @@ def test_timestamp_option(run_reframe): def test_timestamp_option_default(run_reframe): - timefmt_date_part = time.strftime('%FT') returncode, stdout, _ = run_reframe( checkpath=['unittests/resources/checks'], action='list', more_options=['-R', '--timestamp'] ) assert returncode == 0 - assert timefmt_date_part in stdout + + matches = re.findall( + r'(stage|output) directory: .*\/(\d{6}T\d{6}\+\d{4})', stdout + ) + assert len(matches) == 2 def test_list_empty_prgenvs_check_and_options(run_reframe):