Fix iso time

Author: daniel-m-dd

tests/conftest.py

@@ -161,7 +161,7 @@ def unique(request, freezed_time):
     return f"{prefix}-{int(freezed_time.timestamp())}"
 
 
-def relative_time(freezed_time, iso):
+def relative_time(freezed_time, iso, is_iso_with_timezone_indicator):
     time_re = re.compile(r"now( *([+-]) *(\d+)([smhdMy]))?")
 
     def func(arg):
@@ -185,10 +185,16 @@ def func(arg):
                 elif unit == "y":
                     ret += relativedelta(years=num)
             if iso:
-                # Return ISO 8601 formatted string with Z timezone indicator
-                # Example: 2025-04-17T03:17:07.923Z
-                from datetime import timezone
-                return ret.astimezone(timezone.utc).isoformat(timespec="milliseconds").replace("+00:00", "Z")
+                if is_iso_with_timezone_indicator:
+                    # Return ISO 8601 formatted string with Z timezone indicator
+                    # Example: 2025-04-17T03:17:07.923Z
+                    from datetime import timezone
+                    return ret.astimezone(timezone.utc).isoformat(timespec="milliseconds").replace("+00:00", "Z")
+                else:
+                    return ret.replace(tzinfo=None)  # return datetime object and not string
+                    # NOTE this is not a full ISO 8601 format, but it's enough for our needs
+                    # return ret.strftime('%Y-%m-%dT%H:%M:%S') + ret.strftime('.%f')[:4] + 'Z'
+                    
             return int(ret.timestamp())
         return ""
 
@@ -207,6 +213,10 @@ def context(vcr, unique, freezed_time):
     and the undo operations to perform after a test scenario.
     """
     unique_hash = hashlib.sha256(unique.encode("utf-8")).hexdigest()[:16]
+    
+    # Dirty fix as on_call cassette and API use the `Z` format instead of `+00:00`
+    is_iso_with_timezone_indicator = "on_call" in unique
+
     ctx = {
         "undo_operations": [],
         "unique": unique,
@@ -216,8 +226,8 @@ def context(vcr, unique, freezed_time):
         "unique_lower_alnum": PATTERN_ALPHANUM.sub("", unique).lower(),
         "unique_upper_alnum": PATTERN_ALPHANUM.sub("", unique).upper(),
         "unique_hash": unique_hash,
-        "timestamp": relative_time(freezed_time, False),
-        "timeISO": relative_time(freezed_time, True),
+        "timestamp": relative_time(freezed_time, False, False),
+        "timeISO": relative_time(freezed_time, True, is_iso_with_timezone_indicator),
         "uuid": generate_uuid(freezed_time),
     }