From: Tomas Babej Date: Sun, 22 Mar 2015 15:58:38 +0000 (+0100) Subject: tests: Python 2.6. does not support timedelta.total_seconds, add workaround X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/202f4544d3738af03c0c45c5076435fca9c08e9a?ds=sidebyside;hp=--cc tests: Python 2.6. does not support timedelta.total_seconds, add workaround --- 202f4544d3738af03c0c45c5076435fca9c08e9a diff --git a/tasklib/tests.py b/tasklib/tests.py index b740c0d..3e18bc9 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): @@ -805,8 +809,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 > (2,6): + self.assertTrue((now - t['due']).total_seconds() < 5) + self.assertTrue((t['due'] - now).total_seconds() < 5) + else: + self.assertTrue(total_seconds_2_6(now - t['due']) < 5) + self.assertTrue(total_seconds_2_6(t['due'] - now) < 5) def test_simple_eoy_conversion(self): if self.tw.version < six.text_type('2.4.0'):