forked from Janhouse/tespeed
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
stupid changes only to get time and date to csv stdout
- Loading branch information
Rismal Ray Vaughn
committed
May 1, 2013
1 parent
f69ae3e
commit 2e3881f
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
#!/usr/bin/env python2 | ||
# -*- coding: utf-8 -*- | ||
# | ||
# Copyright 2012 Janis Jansons ([email protected]) | ||
# | ||
|
@@ -83,11 +84,10 @@ def __init__(self, server = "", numTop = 0, servercount = 3, store = False, supp | |
|
||
self.units="Mbit" | ||
self.unit=0 | ||
|
||
self.testtime = time.strftime(("%d %d %a %Y %H:%M:%S"), time.localtime()) | ||
if unit: | ||
self.units="MiB" | ||
self.unit=1 | ||
|
||
self.store=store | ||
self.suppress=suppress | ||
if store: | ||
|
@@ -383,7 +383,7 @@ def LoadServers(self): | |
'lat': float(server.attrib['lat']), | ||
'lon': float(server.attrib['lon']), | ||
'url': server.attrib['url'].rsplit('/', 1)[0] + '/', | ||
#'url2': server.attrib['url2'].rsplit('/', 1)[0] + '/', | ||
'url2': server.attrib['url2'].rsplit('/', 1)[0] + '/', | ||
'name': server.attrib['name'], | ||
'country': server.attrib['country'], | ||
'sponsor': server.attrib['sponsor'], | ||
|
@@ -570,8 +570,8 @@ def TestSpeed(self): | |
|
||
self.TestDownload() | ||
self.TestUpload() | ||
|
||
print_result("%0.2f,%0.2f,\"%s\",\"%s\"\n" % (self.down_speed, self.up_speed, self.units, self.servers)) | ||
#_rml adding self.timetest | ||
print_result("%0.2f,%0.2f,\"%s\",\"%s\",\"%s\" \n" % (self.down_speed, self.up_speed, self.units, self.servers, self.testtime)) | ||
|
||
def ListServers(self, num=0): | ||
|
||
|