Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions Lib/test/test_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -6752,6 +6752,7 @@ def add_record(message: str) -> None:
fh.emit(record)
fh.close()

start = datetime.datetime.now()
add_record('testing - initial')
self.assertLogFile(self.fn)
# Sleep a little over the half of rollover time - and this value
Expand All @@ -6764,18 +6765,24 @@ def add_record(message: str) -> None:

# At this point, the log file should be rotated if the rotation
# is based on creation time but should be not if it's based on
# modification time.
found = False
# modification time. The rotated file is named after the creation
# time of the log file, so search back over the whole time the test
# took rather than over a fixed number of seconds.
now = datetime.datetime.now()
GO_BACK = 5 # seconds
for secs in range(GO_BACK + 1):
test_duration = int((now - start).total_seconds())
# Two seconds of margin on top of that: the log file is created in
# setUp(), a moment before the test starts, and the name has a
# resolution of one second.
oldest = test_duration + 2
found = False
for secs in range(oldest + 1): # inclusive of oldest
prev = now - datetime.timedelta(seconds=secs)
fn = self.fn + prev.strftime(".%Y-%m-%d_%H-%M-%S")
found = os.path.exists(fn)
if found:
self.rmfiles.append(fn)
break
msg = 'No rotated files found, went back %d seconds' % GO_BACK
msg = 'No rotated files found, went back %d seconds' % oldest
if not found:
# print additional diagnostics
dn, fn = os.path.split(self.fn)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix ``test_rollover_based_on_st_birthtime_only`` in ``test_logging`` on slow
machines: search for the rotated file over the whole duration of the test
instead of a fixed 5 seconds.
Loading