From 2cdb8c90d186feb0ec13f1b08fab75c6b3dda07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Mon, 21 Oct 2024 12:08:52 +0200 Subject: [PATCH] Use UTC timezone when handling keys in kasp test library When working with key timestamps, ensure we correctly set the UTC timezone in order for the tests to work consistently regardless of the local time setting. (cherry picked from commit f840deba33f0b719fed0c9b6ad33a2a181406b38) --- bin/tests/system/isctest/kasp.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/isctest/kasp.py b/bin/tests/system/isctest/kasp.py index ea1ec9878e..6402998471 100644 --- a/bin/tests/system/isctest/kasp.py +++ b/bin/tests/system/isctest/kasp.py @@ -17,8 +17,7 @@ import subprocess import time from typing import Optional, Union -from datetime import datetime -from datetime import timedelta +from datetime import datetime, timedelta, timezone import dns import isctest.log @@ -54,7 +53,9 @@ class KeyTimingMetadata: def __init__(self, timestamp: str): if int(timestamp) <= 0: raise ValueError(f'invalid timing metadata value: "{timestamp}"') - self.value = datetime.strptime(timestamp, self.FORMAT) + self.value = datetime.strptime(timestamp, self.FORMAT).replace( + tzinfo=timezone.utc + ) def __repr__(self): return self.value.strftime(self.FORMAT) @@ -95,7 +96,7 @@ class KeyTimingMetadata: @staticmethod def now() -> "KeyTimingMetadata": result = KeyTimingMetadata.__new__(KeyTimingMetadata) - result.value = datetime.now() + result.value = datetime.now(timezone.utc) return result