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

Fix 

uploading always comes first, the download always comes second. :)
This commit is contained in:
VYCKTOR HUGO STARK 2016-08-23 15:16:23 -04:00 committed by GitHub
parent 7b09d8759f
commit 160fdf71f9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
speedtest_cli.py
View File

@ -714,13 +714,6 @@ def speedtest():
for i in range(0, 4): for i in range(0, 4):
urls.append('%s/random%sx%s.jpg' % urls.append('%s/random%sx%s.jpg' %
(os.path.dirname(best['url']), size, size)) (os.path.dirname(best['url']), size, size))
if not args.simple:
print_('Testing download speed', end='')
dlspeed = downloadSpeed(urls, args.simple)
if not args.simple:
print_()
print_('Download: %0.2f M%s/s' %
((dlspeed / 1000 / 1000) * args.units[1], args.units[0]))
sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)] sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
sizes = [] sizes = []
@ -735,6 +728,14 @@ def speedtest():
print_('Upload: %0.2f M%s/s' % print_('Upload: %0.2f M%s/s' %
((ulspeed / 1000 / 1000) * args.units[1], args.units[0])) ((ulspeed / 1000 / 1000) * args.units[1], args.units[0]))
if not args.simple:
print_('Testing download speed \n', end='')
dlspeed = downloadSpeed(urls, args.simple)
if not args.simple:
print_()
print_('Download: %0.2f M%s/s' %
((dlspeed / 1000 / 1000) * args.units[1], args.units[0]))
if args.share and args.mini: if args.share and args.mini:
print_('Cannot generate a speedtest.net share results image while ' print_('Cannot generate a speedtest.net share results image while '
'testing against a Speedtest Mini server') 'testing against a Speedtest Mini server')