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

Divide by float to avoid incorrect 0 values

This commit is contained in:
Matt Martz 2016-08-30 13:43:46 -05:00
parent 01abb3ae71
commit 64b03777da
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
speedtest.py
View File

@ -553,9 +553,9 @@ class SpeedtestResults(object):
raise SpeedtestConfigError('Unknown units, valid configurations ' raise SpeedtestConfigError('Unknown units, valid configurations '
'are ("bit", 8) and ("byte", 1)') 'are ("bit", 8) and ("byte", 1)')
download = int(round(bit_download / 1000, 0)) download = int(round(bit_download / 1000.0, 0))
ping = int(round(self.ping, 0)) ping = int(round(self.ping, 0))
upload = int(round(bit_upload / 1000, 0)) upload = int(round(bit_upload / 1000.0, 0))
# Build the request to send results back to speedtest.net # Build the request to send results back to speedtest.net
# We use a list instead of a dict because the API expects parameters # We use a list instead of a dict because the API expects parameters
@ -637,9 +637,9 @@ class SpeedtestResults(object):
return """Ping: %s ms return """Ping: %s ms
Download: %0.2f M%s/s Download: %0.2f M%s/s
Upload: %0.2f M%s/s""" % (self.ping, Upload: %0.2f M%s/s""" % (self.ping,
(self.download / 1000 / 1000), (self.download / 1000.0 / 1000.0),
self.units[0], self.units[0],
(self.upload / 1000 / 1000), (self.upload / 1000.0 / 1000.0),
self.units[0]) self.units[0])
@ -949,7 +949,7 @@ class Speedtest(object):
cum.append(3600) cum.append(3600)
h.close() h.close()
avg = round((sum(cum) / 6) * 1000, 3) avg = round((sum(cum) / 6) * 1000.0, 3)
results[avg] = server results[avg] = server
fastest = sorted(results.keys())[0] fastest = sorted(results.keys())[0]
@ -1315,14 +1315,14 @@ def shell():
end=('', '\n')[bool(debug)]) end=('', '\n')[bool(debug)])
speedtest.download(callback=callback) speedtest.download(callback=callback)
printer('Download: %0.2f M%s/s' % printer('Download: %0.2f M%s/s' %
((results.download / 1000 / 1000), args.units[0]), ((results.download / 1000.0 / 1000.0), args.units[0]),
quiet) quiet)
printer('Testing upload speed', quiet, printer('Testing upload speed', quiet,
end=('', '\n')[bool(debug)]) end=('', '\n')[bool(debug)])
speedtest.upload(callback=callback) speedtest.upload(callback=callback)
printer('Upload: %0.2f M%s/s' % printer('Upload: %0.2f M%s/s' %
((results.upload / 1000 / 1000), args.units[0]), ((results.upload / 1000.0 / 1000.0), args.units[0]),
quiet) quiet)
if args.simple: if args.simple: