git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

pytest: test 16_01 stabilize

Browse Source 
When checking the reported times of a transfer, do not exptect
the 'queue' time to be in any relation to others. 'queue' uses its own
start timestamp and the reported duration is thereofore independant.

Ref: #20112
Closes #20163
This commit is contained in:
Stefan Eissing 2026-01-02 14:08:21 +01:00 committed by Viktor Szakats
parent d07024cf93
commit 68b94daeb8
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/http/testenv/curl.py
View File

@ -29,6 +29,7 @@ import logging
import os
import sys
import time
from functools import cmp_to_key
from threading import Thread
import psutil
@ -525,12 +526,12 @@ class ExecResult:
}
# stat keys where we expect a positive value
ref_tl = []
somewhere_keys = []
# time_queue has it's own start timestamp. Other timers start *after*
# queueing is done. queue duration might therefore be anywhere.
somewhere_keys = ['time_queue']
exact_match = True
# redirects mess up the queue time, only count without
if s['time_redirect'] == 0:
ref_tl += ['time_queue']
else:
# redirects mess up the times, some are accumulative
if s['time_redirect']:
exact_match = False
# connect events?
if url.startswith('ftp'):
@ -549,7 +550,7 @@ class ExecResult:
ref_tl += dl_tl
# the first byte of the response may arrive before we
# track the other times when the client is slow (CI).
somewhere_keys = ['time_starttransfer']
somewhere_keys.extend(['time_starttransfer'])
elif s['size_upload'] > 0 and s['size_download'] == 0:
# this is an upload
ul_tl = ['time_pretransfer', 'time_posttransfer']
@ -567,9 +568,16 @@ class ExecResult:
# assert all events not in reference timeline are 0
for key in [key for key in all_keys if key not in ref_tl and key not in somewhere_keys]:
self.check_stat_zero(s, key)
# calculate the timeline that did happen
seen_tl = sorted(ref_tl, key=lambda ts: s[ts])
assert seen_tl == ref_tl, f'{[f"{ts}: {s[ts]}" for ts in seen_tl]}'
def cmp_ts(t1, t2):
n = s[t1] - s[t2]
if not n: # same timestamp, order to expected occurrence
return ref_tl.index(t1) - ref_tl.index(t2)
return n
seen_tl = sorted(ref_tl, key=cmp_to_key(cmp_ts))
assert seen_tl == ref_tl, f'timeline {idx}: {[f"{ts}: {s[ts]}" for ts in seen_tl]}\n{self.dump_logs()}'
for key in somewhere_keys:
self.check_stat_positive(s, idx, key)
assert s[key] <= s['time_total']