From c6d62f8fc2ccb891e9f9e92cb690862f68ea731b Mon Sep 17 00:00:00 2001 From: Andrew Molyneux Date: Sun, 28 Jul 2013 20:01:24 +0100 Subject: [PATCH 1/2] --server option wasn't working --- speedtest-cli | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/speedtest-cli b/speedtest-cli index 559898a..91cf22b 100755 --- a/speedtest-cli +++ b/speedtest-cli @@ -401,6 +401,7 @@ def speedtest(): if not args.simple: print_('Testing from %(isp)s (%(ip)s)...' % config['client']) + best = None if args.server: try: best = getBestServer(filter(lambda x: x['id'] == args.server, @@ -442,7 +443,8 @@ def speedtest(): else: if not args.simple: print_('Selecting best server based on ping...') - best = getBestServer(servers) + if best is None: + best = getBestServer(servers) if not args.simple: print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' From 38a918cda9f7bde58444d138c1f5cd0025f8355d Mon Sep 17 00:00:00 2001 From: Andrew Molyneux Date: Sun, 28 Jul 2013 20:08:13 +0100 Subject: [PATCH 2/2] Suppress 'Selecting best server' message if server already specified --- speedtest-cli | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/speedtest-cli b/speedtest-cli index 91cf22b..07dfae7 100755 --- a/speedtest-cli +++ b/speedtest-cli @@ -441,9 +441,9 @@ def speedtest(): except: best = servers[0] else: - if not args.simple: - print_('Selecting best server based on ping...') if best is None: + if not args.simple: + print_('Selecting best server based on ping...') best = getBestServer(servers) if not args.simple: