Skip to content

Commit 2c06b45

Browse files
merge: resolve conflict with master after #2144 merge
Co-Authored-By: Itamar Hartstein <haritamar@gmail.com>
2 parents b9635a8 + 035653a commit 2c06b45

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

elementary/monitor/api/tests/tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,13 @@ def _parse_test_db_row(cls, test_db_row: TestDBRowSchema) -> TestSchema:
429429
),
430430
created_at=test_db_row.created_at if test_db_row.created_at else None,
431431
latest_run_time=(
432-
latest_run_datetime.isoformat() if latest_run_datetime else None
433-
),
434-
latest_run_time_utc=(
435432
latest_run_datetime.astimezone(tz.tzlocal()).isoformat()
436433
if latest_run_datetime
437434
else None
438435
),
436+
latest_run_time_utc=(
437+
latest_run_datetime.isoformat() if latest_run_datetime else None
438+
),
439439
latest_run_status=(
440440
test_db_row.latest_run_status if test_db_row.latest_run_status else None
441441
),

0 commit comments

Comments
 (0)