public_git
/
speedtest-cli
mirror of https://github.com/sivel/speedtest-cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from mihaic/units-fix 

Use 1000 as multiplier for Mbit/s and kbit/s
This commit is contained in:
Matt Martz 2013-04-27 07:04:45 -07:00
parent f358b5ec27 1df0cf239f
commit 3272db0041
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
speedtest-cli
View File

@ -352,9 +352,9 @@ def speedtest():
dlspeed = downloadSpeed(urls, args.simple) dlspeed = downloadSpeed(urls, args.simple)
if not args.simple: if not args.simple:
print print
print 'Download: %0.2f Mbit/s' % ((dlspeed / 1024 / 1024) * 8) print 'Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8)
sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)] sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
sizes = [] sizes = []
for size in sizesizes: for size in sizesizes:
for i in xrange(0, 25): for i in xrange(0, 25):
@ -364,12 +364,12 @@ def speedtest():
ulspeed = uploadSpeed(best['url'], sizes, args.simple) ulspeed = uploadSpeed(best['url'], sizes, args.simple)
if not args.simple: if not args.simple:
print print
print 'Upload: %0.2f Mbit/s' % ((ulspeed / 1024 / 1024) * 8) print 'Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8)
if args.share: if args.share:
dlspeedk = int(round((dlspeed / 1024) * 8, 0)) dlspeedk = int(round((dlspeed / 1000) * 8, 0))
ping = int(round(best['latency'], 0)) ping = int(round(best['latency'], 0))
ulspeedk = int(round((ulspeed / 1024) * 8, 0)) ulspeedk = int(round((ulspeed / 1000) * 8, 0))
apiData = [ apiData = [
'download=%s' % dlspeedk, 'download=%s' % dlspeedk,

10
speedtest-cli-3
View File

@ -329,9 +329,9 @@ def speedtest():
dlspeed = downloadSpeed(urls, args.simple) dlspeed = downloadSpeed(urls, args.simple)
if not args.simple: if not args.simple:
print() print()
print('Download: %0.2f Mbit/s' % ((dlspeed / 1024 / 1024) * 8)) print('Download: %0.2f Mbit/s' % ((dlspeed / 1000 / 1000) * 8))
sizesizes = [int(.25 * 1024 * 1024), int(.5 * 1024 * 1024)] sizesizes = [int(.25 * 1000 * 1000), int(.5 * 1000 * 1000)]
sizes = [] sizes = []
for size in sizesizes: for size in sizesizes:
for i in range(0, 25): for i in range(0, 25):
@ -341,12 +341,12 @@ def speedtest():
ulspeed = uploadSpeed(best['url'], sizes, args.simple) ulspeed = uploadSpeed(best['url'], sizes, args.simple)
if not args.simple: if not args.simple:
print() print()
print('Upload: %0.2f Mbit/s' % ((ulspeed / 1024 / 1024) * 8)) print('Upload: %0.2f Mbit/s' % ((ulspeed / 1000 / 1000) * 8))
if args.share: if args.share:
dlspeedk = int(round((dlspeed / 1024) * 8, 0)) dlspeedk = int(round((dlspeed / 1000) * 8, 0))
ping = int(round(best['latency'], 0)) ping = int(round(best['latency'], 0))
ulspeedk = int(round((ulspeed / 1024) * 8, 0)) ulspeedk = int(round((ulspeed / 1000) * 8, 0))
apiData = [ apiData = [
'download=%s' % dlspeedk, 'download=%s' % dlspeedk,