Skip to content

Commit

Permalink
Merge branch 'develop' into packaging/ship-getpip
Browse files Browse the repository at this point in the history
  • Loading branch information
vkarak authored Oct 22, 2024
2 parents 1dbc64e + 90d6980 commit c02b697
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion reframe/core/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def instantiate_all(self, reset_sysenv=0, external_vars=None):
kwargs['reset_sysenv'] = reset_sysenv
leaf_tests.append(test(*args, **kwargs))
except SkipTestError as e:
getlogger().warning(
getlogger().verbose(
f'skipping test {test.__qualname__!r}: {e}'
)
except Exception:
Expand Down
6 changes: 4 additions & 2 deletions reframe/frontend/reporting/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import statistics
import types
from collections import namedtuple
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
from numbers import Number
from .storage import StorageBackend

Expand Down Expand Up @@ -89,7 +89,9 @@ def _parse_timestamp(s):
if isinstance(s, Number):
return s

now = datetime.now()
# Use UTC timezone to avoid daylight saving skewing when adding/subtracting
# periods across a daylight saving switch date
now = datetime.now(timezone.utc)

def _do_parse(s):
if s == 'now':
Expand Down

0 comments on commit c02b697

Please sign in to comment.