OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-11-26 00:56:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into V12

Browse source
This commit is contained in:
Jasmin Bom 2019-02-09 18:45:00 +01:00
commit 2e203e41e4
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
telegram/ext/jobqueue.py
View file

@ -77,7 +77,7 @@ class JobQueue(object):
raise ValueError('next_t is None')
if isinstance(next_t, datetime.datetime):
next_t = (next_t - datetime.datetime.now(next_t.tzinfo)).total_seconds()
next_t = (next_t - datetime.datetime.now()).total_seconds()
elif isinstance(next_t, datetime.time):
next_datetime = datetime.datetime.combine(datetime.date.today(), next_t)

18
tests/test_jobqueue.py
View file

@ -198,24 +198,6 @@ class TestJobQueue(object):
sleep(0.06)
assert pytest.approx(self.job_time) == expected_time
def test_datetime_with_timezone_job_run_once(self, job_queue):
# Test that run_once jobs work with timezone aware datetimes.
offset = datetime.timedelta(hours=-3)
when = datetime.datetime.now(datetime.timezone(offset))
job_queue.run_once(self.job_run_once, when)
sleep(0.01)
assert self.result == 1
def test_datetime_with_timezone_job_run_repeating(self, job_queue):
# Test that run_repeating jobs work with timezone aware datetimes.
offset = datetime.timedelta(hours=5)
now_with_offset = datetime.datetime.now(datetime.timezone(offset))
job_queue.run_repeating(self.job_run_once, interval=0.01, first=now_with_offset)
sleep(0.015)
assert self.result == 2
def test_time_unit_dt_time_today(self, job_queue):
# Testing running at a specific time today
delta = 0.05