]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

tests: Python 2.6. does not support timedelta.total_seconds, add workaround
authorTomas Babej <tomasbabej@gmail.com>
Sun, 22 Mar 2015 15:58:38 +0000 (16:58 +0100)
committerTomas Babej <tomasbabej@gmail.com>
Sun, 22 Mar 2015 15:58:38 +0000 (16:58 +0100)
tasklib/tests.py

index b740c0db4b64e0c3323ffbf7aef556a610ae1382..3e18bc96d4c9ed094a7e8b742d68017c0b1a04bd 100644 (file)
@@ -7,6 +7,7 @@ import json
 import pytz
 import six
 import shutil
 import pytz
 import six
 import shutil
+import sys
 import tempfile
 import unittest
 
 import tempfile
 import unittest
 
@@ -36,6 +37,9 @@ TASK_STANDARD_ATTRS = (
     'annotations',
 )
 
     'annotations',
 )
 
+total_seconds_2_6 = lambda x: x.microseconds / 1e6 + x.seconds + x.days * 24 * 3600
+
+
 class TasklibTest(unittest.TestCase):
 
     def setUp(self):
 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
         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'):
 
     def test_simple_eoy_conversion(self):
         if self.tw.version < six.text_type('2.4.0'):