GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make python tests use timezone, py3.12 deprecated tz-less utcnow()

Browse source 
Python upstream is trying to eliminate tz-naive date functions that
imply anything to do with a timezone, even UTC.  They have deprecated
datetime.datetime.utcnow() in Python 3.12 and thus running tests emits
many warnings for us.

We switch to instantiate datetime objects taht are intended to reflect
UTC to have a timezone, or if we instantiate naive ones and then later
convert, we do the full conversion.

After the changes, the tests still work on Python 3.9, but now also on
Python 3.12 without warnings.

See PR description for #632 for more details.

Signed-off-by: Scott Mcdermott <scott@smemsh.net>
This commit is contained in:
Scott Mcdermott 2024-08-20 19:06:13 -07:00 • committed by Thomas Lauf
parent 05b72bba6f
commit 05724a9d21
22 changed files with 220 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/modify.t
View file

@ -29,7 +29,8 @@
import os
import sys
import unittest
from datetime import datetime, timedelta
from datetime import datetime, timezone, timedelta
from dateutil import tz
# Ensure python finds the local simpletap module
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
@ -43,7 +44,7 @@ class TestModify(TestCase):
def test_modify_end_of_open_interval(self):
"""Attempt to modify end of an open interval"""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
one_hour_before_utc = now_utc - timedelta(hours=1)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc))
@ -52,7 +53,7 @@ class TestModify(TestCase):
def test_modify_start_of_open_interval(self):
"""Modify start of open interval"""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
one_hour_before_utc = now_utc - timedelta(hours=1)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc))
@ -65,7 +66,7 @@ class TestModify(TestCase):
def test_modify_invalid_subcommand(self):
"""Modify without (start|stop) subcommand"""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
one_hour_before_utc = now_utc - timedelta(hours=1)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc))
@ -75,7 +76,7 @@ class TestModify(TestCase):
def test_modify_no_end_time(self):
"""Modify without a time to stop at"""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
one_hour_before_utc = now_utc - timedelta(hours=1)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(one_hour_before_utc))
@ -85,7 +86,7 @@ class TestModify(TestCase):
def test_modify_shorten_one_hour(self):
"""Shorten the interval by one hour."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -102,7 +103,7 @@ class TestModify(TestCase):
def test_modify_shorten_before_start(self):
"""Modify should not move end before start."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -114,7 +115,7 @@ class TestModify(TestCase):
def test_modify_start_to_after_end(self):
"""Modify should not move start beyond end."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -126,7 +127,7 @@ class TestModify(TestCase):
def test_modify_start_within_interval(self):
"""Increase start time within interval."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -143,7 +144,7 @@ class TestModify(TestCase):
def test_modify_move_stop_to_overlap_following_interval(self):
"""Move end time to overlap with following interval."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -155,7 +156,7 @@ class TestModify(TestCase):
def test_modify_move_start_to_overlap_preceeding_interval(self):
"""Move start time to overlap with preceeding interval."""
now_utc = datetime.now().utcnow()
now_utc = datetime.now(timezone.utc)
self.t("start {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=3)))
self.t("stop {:%Y-%m-%dT%H:%M:%S}Z".format(now_utc - timedelta(hours=1)))
@ -172,7 +173,7 @@ class TestModify(TestCase):
three_hours_before = now - timedelta(hours=3)
four_hours_before = now - timedelta(hours=4)
now_utc = now.utcnow().replace(second=0, microsecond=0, minute=0)
now_utc = now.replace(tzinfo=tz.tzlocal()).astimezone(timezone.utc).replace(second=0, microsecond=0, minute=0)
day_before = now_utc - timedelta(days=1)
three_hours_before_utc = now_utc - timedelta(hours=3)
four_hours_before_utc = now_utc - timedelta(hours=4)
@ -212,7 +213,7 @@ class TestModify(TestCase):
three_hours_before = now - timedelta(hours=3)
four_hours_before = now - timedelta(hours=4)
now_utc = now.utcnow().replace(second=0, microsecond=0, minute=0)
now_utc = now.replace(tzinfo=tz.tzlocal()).astimezone(timezone.utc).replace(second=0, microsecond=0, minute=0)
day_before = now_utc - timedelta(days=1)
three_hours_before_utc = now_utc - timedelta(hours=3)
four_hours_before_utc = now_utc - timedelta(hours=4)
@ -255,7 +256,7 @@ class TestModify(TestCase):
three_hours_before = now - timedelta(hours=3)
four_hours_before = now - timedelta(hours=4)
now_utc = now.utcnow().replace(second=0, microsecond=0, minute=0)
now_utc = now.replace(tzinfo=tz.tzlocal()).astimezone(timezone.utc).replace(second=0, microsecond=0, minute=0)
four_hours_before_utc = now_utc - timedelta(hours=4)
self.t.configure_exclusions((four_hours_before.time(), three_hours_before.time()))