Add some unit tests for timeformat.py

Author: dmptrluke

cloudbot/util/test/test_timeformat.py

@@ -0,0 +1,11 @@
+from cloudbot.util.timeformat import format_time, timesince, timeuntil
+
+
+def test_format_time():
+    # basic
+    assert format_time(120000) == "1 day, 9 hours and 20 minutes"
+    assert format_time(120000, simple=True) == "1d 9h 20m"
+    # 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"

cloudbot/util/timeformat.py

@@ -58,7 +58,7 @@ def timeuntil(d, now=None, count=2, accuracy=6, simple=False):
     """
     if not now:
         now = datetime.datetime.now()
-    return timesince(now, d, count=3, accuracy=6, simple=False)
+    return timesince(now, d, count, accuracy, simple)
 
 
 def format_time(seconds, count=3, accuracy=6, simple=False):
@@ -107,6 +107,7 @@ def format_time(seconds, count=3, accuracy=6, simple=False):
     strings = []
     i = 0
     for period_name, period_seconds in periods:
+        print(i, period_name)
         if i < count:
             if seconds > period_seconds:
                 period_value, seconds = divmod(seconds, period_seconds)