tests: Python 2.6. does not support timedelta.total_seconds, add workaround

[etc/taskwarrior.git] / tasklib / tests.py

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 71ee90ba8af179ca328aa9a8943f622d2f2e658a..3e18bc96d4c9ed094a7e8b742d68017c0b1a04bd 100644 (file)
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -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'):


@@ -842,15 +850,23 @@ class DatetimeStringTest(TasklibTest):
         now = local_zone.localize(datetime.datetime.now())
         due_date = local_zone.localize(datetime.datetime(
             year=now.year,
         now = local_zone.localize(datetime.datetime.now())
         due_date = local_zone.localize(datetime.datetime(
             year=now.year,

-            month=9,
-            day=3,
-            hour=0,
+            month=12,
+            day=31,
+            hour=23,

             minute=59,
             second=59
             minute=59,
             second=59

-            ))
+            )) - datetime.timedelta(0,4 * 30 * 86400)

         self.assertEqual(due_date, t['due'])
 
     def test_filtering_with_string_datetime(self):
         self.assertEqual(due_date, t['due'])
 
     def test_filtering_with_string_datetime(self):

+        if self.tw.version < six.text_type('2.4.0'):
+            # Python2.6 does not support SkipTest. As a workaround
+            # mark the test as passed by exiting.
+            if getattr(unittest, 'SkipTest', None) is not None:
+                raise unittest.SkipTest()
+            else:
+                return
+

         t = Task(self.tw, description="test task",
                  due=datetime.datetime.now() - datetime.timedelta(0,2))
         t.save()
         t = Task(self.tw, description="test task",
                  due=datetime.datetime.now() - datetime.timedelta(0,2))
         t.save()