Increase timeformat.py unit test coverage

Author: dmptrluke

cloudbot/util/test/test_timeformat.py

@@ -1,5 +1,7 @@
 from cloudbot.util.timeformat import format_time, timesince, timeuntil
 
+from datetime import datetime, timezone
+
 
 def test_format_time():
     # basic
@@ -8,4 +10,29 @@ def test_format_time():
     # count
     assert format_time(1200003, count=4) == "13 days, 21 hours, 20 minutes and 3 seconds"
     assert format_time(1200000, count=4) == "13 days, 21 hours and 20 minutes"
-    assert format_time(1200000, count=2) == "13 days and 21 hours"
+    assert format_time(1200000, count=2) == "13 days and 21 hours"
+
+
+def test_timesince():
+    then = datetime(2010, 4, 12, 12, 30, 0)
+    then_timestamp = 1271075400.0
+    then_future = datetime(2012, 4, 12, 12, 30, 0)
+    now = datetime(2010, 5, 15, 1, 50, 0)
+    now_timestamp = 1273888200.0
+    # timestamp
+    assert timesince(then_timestamp, now_timestamp) == "1 month and 2 days"
+    # basic
+    assert timesince(then, now) == "1 month and 2 days"
+    # count
+    assert timesince(then, now, count=3) == "1 month, 2 days and 13 hours"
+    # future
+    assert timesince(then_future, now) == "0 minutes"
+
+
+def test_timeuntil():
+    now = datetime(2010, 4, 12, 12, 30, 0)
+    future = datetime(2010, 5, 15, 1, 50, 0)
+    # basic
+    assert timeuntil(future, now) == "1 month and 2 days"
+    # count
+    assert timeuntil(future, now, count=3) == "1 month, 2 days and 13 hours"