Skip to content

Commit 72b5d36

Browse files
committed
Fix post-rebase failures
1 parent 50dec2f commit 72b5d36

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

reframe/frontend/cli.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,10 +1060,11 @@ def restrict_logging():
10601060

10611061
for rpt in reports:
10621062
uuid = rpt.store()
1063-
printer.info(f'Successfully imported session {uuid}')
1063+
printer.verbose(f'Successfully imported session {uuid}')
10641064

1065+
printer.info(f'Successfully imported {len(reports)} sessions')
10651066
if not reports:
1066-
printer.info('No sessions have been imported')
1067+
printer.warning('No sessions have been imported')
10671068

10681069
sys.exit(0)
10691070

reframe/frontend/reporting/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
from reframe.core.warnings import suppress_deprecations
3232
from reframe.utility import nodelist_abbrev, nodelist_expand, OrderedSet
3333
from .storage import StorageBackend
34-
from .utility import Aggregator, parse_cmp_spec, parse_query_spec
34+
from .utility import (Aggregator, parse_cmp_spec,
35+
parse_query_spec, parse_time_period)
3536

3637
# The schema data version
3738
# Major version bumps are expected to break the validation of previous schemas
@@ -406,7 +407,7 @@ def create_from_sqlite_db(cls, *dbfiles, exclude_sessions=None,
406407

407408
start = time_period.get('start', '19700101T0000+0000')
408409
end = time_period.get('end', 'now')
409-
ts_start, ts_end = parse_time_period(f'{start}:{end}')
410+
qs = parse_query_spec(f'{start}:{end}')
410411
include_sessions = set(include_sessions) if include_sessions else set()
411412
exclude_sessions = set(exclude_sessions) if exclude_sessions else set()
412413
reports = []
@@ -420,8 +421,7 @@ def create_from_sqlite_db(cls, *dbfiles, exclude_sessions=None,
420421
)
421422
continue
422423

423-
sessions = src_backend.fetch_sessions_time_period(ts_start, ts_end)
424-
for sess in sessions:
424+
for sess in src_backend.fetch_sessions(qs):
425425
uuid = sess['session_info']['uuid']
426426
if include_sessions and uuid not in include_sessions:
427427
continue

0 commit comments

Comments
 (0)