Ensure timedelta_to_relative_validity returns an int

andrewbird · andrewbird · commit 97fc23507283 · 2012-06-19T09:27:27.000+01:00
The timedelta_to_relative_validity function would return a float that
we later expected to convert as if it were an int. Force it to be an
int and improve the tests a little.
diff --git a/messaging/test/test_sms.py b/messaging/test/test_sms.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime, timedelta
-import unittest
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from messaging.sms import SmsSubmit, SmsDeliver
 from messaging.utils import (timedelta_to_relative_validity as to_relative,
@@ -11,6 +15,14 @@
 class TestEncodingFunctions(unittest.TestCase):
 
     def test_converting_timedelta_to_validity(self):
+        self.assertRaises(ValueError, to_relative, timedelta(minutes=4))
+        self.assertRaises(ValueError, to_relative, timedelta(weeks=64))
+
+        self.assertIsInstance(to_relative(timedelta(hours=6)), int)
+        self.assertIsInstance(to_relative(timedelta(hours=18)), int)
+        self.assertIsInstance(to_relative(timedelta(days=15)), int)
+        self.assertIsInstance(to_relative(timedelta(weeks=31)), int)
+
         self.assertEqual(to_relative(timedelta(minutes=5)), 0)
         self.assertEqual(to_relative(timedelta(minutes=6)), 0)
         self.assertEqual(to_relative(timedelta(minutes=10)), 1)
diff --git a/messaging/utils.py b/messaging/utils.py
@@ -237,17 +237,17 @@ def timedelta_to_relative_validity(t):
         raise ValueError("Max validity is 63 weeks")
 
     if t <= timedelta(hours=12):
-        return floor(t.seconds / (60 * 5)) - 1
+        return int(floor(t.seconds / (60 * 5))) - 1
 
     if t <= timedelta(hours=24):
         t -= timedelta(hours=12)
-        return floor(t.seconds / (60 * 30)) + 143
+        return int(floor(t.seconds / (60 * 30))) + 143
 
     if t <= timedelta(days=30):
         return t.days + 166
 
     if t <= timedelta(weeks=63):
-        return floor(t.days / 7) + 192
+        return int(floor(t.days / 7)) + 192
 
 
 def datetime_to_absolute_validity(d, tzname='Unknown'):
