Skip to content

tests: add utc=False tests for TimedRotatingFileHandler #148642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StepfenShawn wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −2
Open

tests: add utc=False tests for TimedRotatingFileHandler #148642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 66 additions & 2 deletions Lib/test/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6658,7 +6658,6 @@ def test_invalid(self):
assertRaises(ValueError, logging.handlers.TimedRotatingFileHandler,
self.fn, 'W7', encoding="utf-8", delay=True)

# TODO: Test for utc=False.
def test_compute_rollover_daily_attime(self):
currentTime = 0
rh = logging.handlers.TimedRotatingFileHandler(
Expand Down Expand Up @@ -6698,7 +6697,41 @@ def test_compute_rollover_daily_attime(self):
finally:
rh.close()

# TODO: Test for utc=False.
# Test utc=False
rh = logging.handlers.TimedRotatingFileHandler(
self.fn, encoding="utf-8", when='MIDNIGHT',
utc=False, atTime=None)
try:
t = time.localtime(currentTime)
currentHour = t[3]
currentMinute = t[4]
currentSecond = t[5]
# Next rollover is at midnight, which is (24 - currentHour) hours from now
expected = currentTime + (24 - currentHour) * 3600 - currentMinute * 60 - currentSecond
actual = rh.computeRollover(currentTime)
self.assertEqual(actual, expected)
finally:
rh.close()

atTime = datetime.time(12, 0, 0)
rh = logging.handlers.TimedRotatingFileHandler(
self.fn, encoding="utf-8", when='MIDNIGHT',
utc=False, atTime=atTime)
try:
t = time.localtime(currentTime)
currentHour = t[3]
currentMinute = t[4]
currentSecond = t[5]
# Next rollover is at atTime today if current time < atTime, otherwise tomorrow
if currentHour < 12:
expected = currentTime + (12 - currentHour) * 3600 - currentMinute * 60 - currentSecond
else:
expected = currentTime + (36 - currentHour) * 3600 - currentMinute * 60 - currentSecond
actual = rh.computeRollover(currentTime)
self.assertEqual(actual, expected)
finally:
rh.close()

def test_compute_rollover_weekly_attime(self):
currentTime = int(time.time())
today = currentTime - currentTime % 86400
Expand Down Expand Up @@ -6753,6 +6786,37 @@ def test_compute_rollover_weekly_attime(self):
finally:
rh.close()

# Test utc=False
wday = time.localtime(today).tm_wday
for day in range(7):
rh = logging.handlers.TimedRotatingFileHandler(
self.fn, encoding="utf-8", when='W%d' % day, interval=1, backupCount=0,
utc=False, atTime=atTime)
try:
if wday > day:
expected = (7 - wday + day)
else:
expected = (day - wday)
expected *= 24 * 60 * 60
expected += 12 * 60 * 60
expected += today

actual = rh.computeRollover(today)
self.assertEqual(actual, expected)

actual = rh.computeRollover(today + 12 * 60 * 60 - 1)
self.assertEqual(actual, expected)

if day == wday:
expected += 7 * 24 * 60 * 60
actual = rh.computeRollover(today + 12 * 60 * 60)
self.assertEqual(actual, expected)

actual = rh.computeRollover(today + 13 * 60 * 60)
self.assertEqual(actual, expected)
finally:
rh.close()

def test_compute_files_to_delete(self):
# See bpo-46063 for background
wd = tempfile.mkdtemp(prefix='test_logging_')
Expand Down
Loading