Skip to content

Commit 7670674

Browse files
committed
Simplify time_in_range and add test
1 parent df2dd08 commit 7670674

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

mtls_server/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,11 @@ def create_dir_if_missing(path):
196196
if not os.path.isdir(path):
197197
os.makedirs(path)
198198

199-
def time_in_range(start, end, t):
199+
def time_in_range(start: float, end: float, t: float) -> bool:
200200
"""Return true if t is in the range [start,end]"""
201201
if start <= end:
202202
return start <= t <= end
203-
else:
204-
return start <= t or t <= end
203+
return False
205204

206205
def has_user(gpg, fingerprint):
207206
keys = gpg.list_keys(keys=fingerprint)

test/test_utils.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
import logging
33
import os
44
import tempfile
5+
import time
56
import unittest
67

78
from mtls_server.utils import create_dir_if_missing
89
from mtls_server.utils import get_abs_path
10+
from mtls_server.utils import time_in_range
911

1012
logging.disable(logging.CRITICAL)
1113
CLEANUP = os.environ.get('CLEANUP', '1')
@@ -29,3 +31,8 @@ def test_create_dir_if_missing(self):
2931
self.assertTrue(os.path.isdir(new_dir))
3032
if CLEANUP == '1':
3133
self.TEMPDIR.cleanup()
34+
35+
def test_time_in_range(self):
36+
self.assertTrue(time_in_range(1,5,2))
37+
self.assertTrue(time_in_range(time.time()-5, time.time()+5, time.time()))
38+
self.assertFalse(time_in_range(time.time()+5, time.time()-5, time.time()))

0 commit comments

Comments
 (0)