Simplify time_in_range and add test

drGrove · Mar 10, 2022 · 7670674 · 7670674
1 parent df2dd08
commit 7670674
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/mtls_server/utils.py b/mtls_server/utils.py
@@ -196,12 +196,11 @@ def create_dir_if_missing(path):
     if not os.path.isdir(path):
         os.makedirs(path)
 
-def time_in_range(start, end, t):
+def time_in_range(start: float, end: float, t: float) -> bool:
     """Return true if t is in the range [start,end]"""
     if start <= end:
         return start <= t <= end
-    else:
-        return start <= t or t <= end
+    return False
 
 def has_user(gpg, fingerprint):
     keys = gpg.list_keys(keys=fingerprint)

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -2,10 +2,12 @@
 import logging
 import os
 import tempfile
+import time
 import unittest
 
 from mtls_server.utils import create_dir_if_missing
 from mtls_server.utils import get_abs_path
+from mtls_server.utils import time_in_range
 
 logging.disable(logging.CRITICAL)
 CLEANUP = os.environ.get('CLEANUP', '1')
@@ -29,3 +31,8 @@ def test_create_dir_if_missing(self):
         self.assertTrue(os.path.isdir(new_dir))
         if CLEANUP == '1':
             self.TEMPDIR.cleanup()
+
+    def test_time_in_range(self):
+        self.assertTrue(time_in_range(1,5,2))
+        self.assertTrue(time_in_range(time.time()-5, time.time()+5, time.time()))
+        self.assertFalse(time_in_range(time.time()+5, time.time()-5, time.time()))