diff --git a/speedtest_cli.py b/speedtest_cli.py index d93d5c3..a148d40 100755 --- a/speedtest_cli.py +++ b/speedtest_cli.py @@ -547,7 +547,7 @@ def version(): raise SystemExit(__version__) -def speedtest(): +def speedtest(**kwargs): """Run the full speedtest.net test""" global shutdown_event, source, scheme @@ -715,7 +715,7 @@ def speedtest(): urls.append('%s/random%sx%s.jpg' % (os.path.dirname(best['url']), size, size)) if not args.simple: - print_('Testing download speed', end='') + print_('Testing download speed PJW', end='') dlspeed = downloadSpeed(urls, args.simple) if not args.simple: print_() @@ -784,6 +784,13 @@ def speedtest(): print_('Share results: %s://www.speedtest.net/result/%s.png' % (scheme, resultid[0])) + speeds = { + 'DL': (dlspeed / 1000 / 1000) * args.units[1], + 'UL': (ulspeed / 1000 / 1000) * args.units[1] + } + + return speeds + def main(): try: