X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/f7c148ec05f006b3385e26017940604ffe9cb7ce..b0b1b863292eb7b5777cfb25a6bc5d1ab0b8282f:/tasklib/tests.py diff --git a/tasklib/tests.py b/tasklib/tests.py index b740c0d..3931e1f 100644 --- a/tasklib/tests.py +++ b/tasklib/tests.py @@ -7,6 +7,7 @@ import json import pytz import six import shutil +import sys import tempfile import unittest @@ -36,6 +37,9 @@ TASK_STANDARD_ATTRS = ( 'annotations', ) +total_seconds_2_6 = lambda x: x.microseconds / 1e6 + x.seconds + x.days * 24 * 3600 + + class TasklibTest(unittest.TestCase): def setUp(self): @@ -287,13 +291,6 @@ class TaskTest(TasklibTest): self.assertRaises(Task.DeletedTask, t.done) - def test_start_completed_task(self): - t = Task(self.tw, description="test task") - t.save() - t.done() - - self.assertRaises(Task.CompletedTask, t.start) - def test_starting_task(self): t = Task(self.tw, description="test task") now = t.datetime_normalizer(datetime.datetime.now()) @@ -805,8 +802,12 @@ class DatetimeStringTest(TasklibTest): now = local_zone.localize(datetime.datetime.now()) # Assert that both times are not more than 5 seconds apart - self.assertTrue((now - t['due']).total_seconds() < 5) - self.assertTrue((t['due'] - now).total_seconds() < 5) + if sys.version_info < (2,7): + self.assertTrue(total_seconds_2_6(now - t['due']) < 5) + self.assertTrue(total_seconds_2_6(t['due'] - now) < 5) + else: + self.assertTrue((now - t['due']).total_seconds() < 5) + self.assertTrue((t['due'] - now).total_seconds() < 5) def test_simple_eoy_conversion(self): if self.tw.version < six.text_type('2.4.0'):