walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use identical download sizes for HTTP- and socket-based download tests 

This requires switching the HTTP download test from the
`/speedtest/randomNxN.jpg` endpoint to the `/download?size=N` endpoint, as
used by the web interface of Speedtest.net currently.
This commit is contained in:
Daniel Lenski 2021-12-30 15:53:51 -05:00
parent 3692ad259b
commit ca4f4a3222
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
speedtest.py
View File

@ -1219,13 +1219,9 @@ class Speedtest(object):
sizes = { sizes = {
'upload': up_sizes[ratio - 1:], 'upload': up_sizes[ratio - 1:],
} }
if self._use_socket: sizes['download'] = [245388, 505544, 1118012, 1986284, 4468241,
sizes['download'] = [245388, 505544, 1118012, 1986284, 4468241, 7907740, 12407926, 17816816, 24262167,
7907740, 12407926, 17816816, 24262167, 31625365]
31625365]
else:
sizes['download'] = [350, 500, 750, 1000, 1500, 2000, 2500,
3000, 3500, 4000]
size_count = len(sizes['upload']) size_count = len(sizes['upload'])
@ -1703,8 +1699,8 @@ class Speedtest(object):
for size in self.config['sizes']['download']: for size in self.config['sizes']['download']:
for _ in range(0, self.config['counts']['download']): for _ in range(0, self.config['counts']['download']):
urls.append( urls.append(
'%s/random%sx%s.jpg' % '%s/download?size=%d' %
(os.path.dirname(self.best['url']), size, size) (os.path.dirname(os.path.dirname(self.best['url'])), size)
) )
request_count = len(urls) request_count = len(urls)