Skip to content

Commit 4dad1c3

Browse files
authored
Merge pull request #88 from jspricke/develop
Support eoy definition in taskwarrior 2.5.2 (Closes: #87)
2 parents 8b04555 + 30cabda commit 4dad1c3

File tree

1 file changed

+32
-12
lines changed

1 file changed

+32
-12
lines changed

tasklib/tests.py

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,13 +1229,22 @@ def test_simple_eoy_conversion(self):
12291229
t = Task(self.tw, description='test task', due='eoy')
12301230
now = local_zone.localize(datetime.datetime.now())
12311231
eoy = local_zone.localize(datetime.datetime(
1232-
year=now.year,
1233-
month=12,
1234-
day=31,
1235-
hour=23,
1236-
minute=59,
1237-
second=59,
1232+
year=now.year+1,
1233+
month=1,
1234+
day=1,
1235+
hour=0,
1236+
minute=0,
1237+
second=0,
12381238
))
1239+
if self.tw.version < '2.5.2':
1240+
eoy = local_zone.localize(datetime.datetime(
1241+
year=now.year,
1242+
month=12,
1243+
day=31,
1244+
hour=23,
1245+
minute=59,
1246+
second=59,
1247+
))
12391248
self.assertEqual(eoy, t['due'])
12401249

12411250
def test_complex_eoy_conversion(self):
@@ -1251,14 +1260,25 @@ def test_complex_eoy_conversion(self):
12511260
now = local_zone.localize(datetime.datetime.now())
12521261
due_date = local_zone.localize(
12531262
datetime.datetime(
1254-
year=now.year,
1255-
month=12,
1256-
day=31,
1257-
hour=23,
1258-
minute=59,
1259-
second=59,
1263+
year=now.year+1,
1264+
month=1,
1265+
day=1,
1266+
hour=0,
1267+
minute=0,
1268+
second=0,
12601269
)
12611270
) - datetime.timedelta(0, 4 * 30 * 86400)
1271+
if self.tw.version < '2.5.2':
1272+
due_date = local_zone.localize(
1273+
datetime.datetime(
1274+
year=now.year,
1275+
month=12,
1276+
day=31,
1277+
hour=23,
1278+
minute=59,
1279+
second=59,
1280+
)
1281+
) - datetime.timedelta(0, 4 * 30 * 86400)
12621282
self.assertEqual(due_date, t['due'])
12631283

12641284
def test_filtering_with_string_datetime(self):

0 commit comments

Comments
 (0)