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

While we don't have to worry about python caching results since we aren't a browser, some proxies cause inconsistent results as they are caching requests

This commit is contained in:
Matt Martz 2014-04-30 08:46:36 -05:00
parent 44bc5d2bef
commit f689af0fc6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
speedtest_cli.py
View File

@ -275,7 +275,8 @@ class HTTPDownloader(threading.Thread):
self.result = [0] self.result = [0]
try: try:
if (time.time() - self.starttime) <= self.timeout: if (time.time() - self.starttime) <= self.timeout:
req = Request(self.url) req = Request('%s?x=%s&y=%s' %
(self.url, int(time.time() * 1000), self.i))
req.add_header('User-Agent', USER_AGENT) req.add_header('User-Agent', USER_AGENT)
f = urlopen(req) f = urlopen(req)
while (1 and not shutdown_event.isSet() and while (1 and not shutdown_event.isSet() and
@ -335,7 +336,9 @@ class HTTPUploader(threading.Thread):
if ((time.time() - self.starttime) <= self.timeout and if ((time.time() - self.starttime) <= self.timeout and
not shutdown_event.isSet()): not shutdown_event.isSet()):
try: try:
req = Request(self.url, self.data) req = Request('%s?x=%s' %
(self.url, int(time.time() * 1000)),
self.data)
req.add_header('User-Agent', USER_AGENT) req.add_header('User-Agent', USER_AGENT)
f = urlopen(req) f = urlopen(req)
except TypeError: except TypeError:
@ -728,7 +731,8 @@ class Speedtest(object):
url = os.path.dirname(server['url']) url = os.path.dirname(server['url'])
for _ in range(0, 3): for _ in range(0, 3):
try: try:
req = Request('%s/latency.txt' % url) req = Request('%s/latency.txt?x=%s' %
(url, int(time.time() * 1000)))
req.add_header('User-Agent', USER_AGENT) req.add_header('User-Agent', USER_AGENT)
f = urlopen(req) f = urlopen(req)
except (HTTPError, URLError): except (HTTPError, URLError):