From 0e25d9023719029058d1a88b47a634bb2e9ac0fb Mon Sep 17 00:00:00 2001 From: spacemanspiff2007 <10754716+spacemanspiff2007@users.noreply.github.com> Date: Mon, 19 Apr 2021 07:32:56 +0200 Subject: [PATCH] more fixes --- tests/helper.py | 4 ++-- tests/jobs/test_job_onetime.py | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/helper.py b/tests/helper.py index 8743627..0ba60ff 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -43,7 +43,7 @@ def cmp_local(obj: Union[float, int, dt_datetime], local_dt: dt_datetime): cmp_dt = instance(obj, local_tz).astimezone(local_tz).naive() else: cmp_dt = from_timestamp(obj, tz=local_tz).naive() - assert cmp_dt == local_dt, f'{cmp_dt}\n{local_dt}' + assert cmp_dt == local_dt, f'\n{cmp_dt}\n{local_dt}' def cmp_utc(obj: Union[float, int, dt_datetime], local_dt: dt_datetime): @@ -54,4 +54,4 @@ def cmp_utc(obj: Union[float, int, dt_datetime], local_dt: dt_datetime): cmp_dt = instance(obj, local_tz).astimezone(local_tz).in_tz(UTC).naive() else: cmp_dt = from_timestamp(obj, tz=UTC).naive() - assert cmp_dt == local_dt, f'{cmp_dt}\n{local_dt}' + assert cmp_dt == local_dt, f'\n{cmp_dt}\n{local_dt}' diff --git a/tests/jobs/test_job_onetime.py b/tests/jobs/test_job_onetime.py index 33949f9..7759fab 100644 --- a/tests/jobs/test_job_onetime.py +++ b/tests/jobs/test_job_onetime.py @@ -1,4 +1,5 @@ import asyncio +from datetime import datetime import pytest @@ -6,8 +7,8 @@ from eascheduler.errors import JobAlreadyCanceledException, OneTimeJobCanNotBeSkipped from eascheduler.jobs.job_one_time import OneTimeJob from eascheduler.schedulers import AsyncScheduler +from tests.helper import cmp_local, utc_ts from tests.helper import mocked_executor, set_now -from tests.helper import utc_ts def test_exception(): @@ -55,12 +56,13 @@ async def test_init(): j._initialize_base_time(None) j._update_run_time() - assert int(j._next_base) == 978346800 - assert int(j._next_run) == 978346800 + + cmp_local(j._next_base, datetime(2001, 1, 1, 12, 0, 0, 1)) + cmp_local(j._next_run, datetime(2001, 1, 1, 12, 0, 0)) j._initialize_base_time(3) j._update_run_time() - assert int(j._next_base) == 978346803 - assert int(j._next_run) == 978346803 + cmp_local(j._next_base, datetime(2001, 1, 1, 12, 0, 3)) + cmp_local(j._next_run, datetime(2001, 1, 1, 12, 0, 3)) j.cancel()