Whitespace cleanup.

This commit is contained in:
Tommi Virtanen 2011-07-11 13:19:54 -07:00
parent e91a3aea66
commit 3fe595abd4
6 changed files with 58 additions and 52 deletions

View file

@ -159,4 +159,3 @@ def get_new_bucket(connection=None):
def teardown(): def teardown():
nuke_prefixed_buckets() nuke_prefixed_buckets()

View file

@ -113,4 +113,3 @@ if __name__ == '__main__':
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
common.teardown() common.teardown()

View file

@ -15,6 +15,7 @@ class Result:
TYPE_NONE = 0 TYPE_NONE = 0
TYPE_READER = 1 TYPE_READER = 1
TYPE_WRITER = 2 TYPE_WRITER = 2
def __init__(self, name, type=TYPE_NONE, time=0, success=True, size=0, details=''): def __init__(self, name, type=TYPE_NONE, time=0, success=True, size=0, details=''):
self.name = name self.name = name
self.type = type self.type = type
@ -37,7 +38,7 @@ class Result:
name=self.name, name=self.name,
size=self.size, size=self.size,
time=self.time, time=self.time,
mbps=(self.size/self.time/1024.0), mbps=self.size / self.time / 1024.0,
details=self.details details=self.details
) )
@ -52,12 +53,14 @@ def reader(seconds, bucket, name=None, queue=None):
end = time.clock() end = time.clock()
elapsed = end - start elapsed = end - start
if queue: if queue:
queue.put(Result(name, queue.put(
Result(
name,
type=Result.TYPE_READER, type=Result.TYPE_READER,
time=elapsed, time=elapsed,
success=fp.valid(), success=fp.valid(),
size=(fp.size/1024) size=fp.size / 1024,
) ),
) )
count += 1 count += 1
if count == 0: if count == 0:
@ -71,7 +74,12 @@ def writer(seconds, bucket, name=None, queue=None, quantity=1, file_size=1, file
if file_name_seed != None: if file_name_seed != None:
r2 = file_name_seed r2 = file_name_seed
files = generate_objects.get_random_files(quantity, 1024*file_size, 1024*file_stddev, r) files = generate_objects.get_random_files(
quantity=quantity,
mean=1024 * file_size,
stddev=1024 * file_stddev,
seed=r,
)
start = time.clock() start = time.clock()
generate_objects.upload_objects(bucket, files, r2) generate_objects.upload_objects(bucket, files, r2)
@ -189,4 +197,3 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View file

@ -991,7 +991,8 @@ def _simple_http_req_100_cont(host, port, method, resource):
req = '{method} {resource} HTTP/1.1\r\nHost: {host}\r\nAccept-Encoding: identity\r\nContent-Length: 123\r\nExpect: 100-continue\r\n\r\n'.format( req = '{method} {resource} HTTP/1.1\r\nHost: {host}\r\nAccept-Encoding: identity\r\nContent-Length: 123\r\nExpect: 100-continue\r\n\r\n'.format(
method=method, method=method,
resource=resource, resource=resource,
host = host) host=host,
)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(5) s.settimeout(5)