Make readwrite test put objects one by one, so it can report keys.

diff --git a/s3tests/rand_readwrite.py b/s3tests/rand_readwrite.py
index 16fc35e8337b47e5d881defcb09e84ad0f939d84..2b0b58955310d6222b069711a682bacdc2d73682 100644 (file)
--- a/s3tests/rand_readwrite.py
+++ b/s3tests/rand_readwrite.py
@@ -53,10 +53,19 @@ def writer(bucket, name, queue, file_size=1, file_stddev=0, file_name_seed=None)
         seed=r,
         )
 
+    names = realistic.names(
+        mean=15,
+        stddev=4,
+        seed=r2,
+        )
+
     while True:
         fp = next(files)
+        objname = next(names)
+        key = bucket.new_key(objname)
+
         start = time.time()
-        generate_objects.upload_objects(bucket, [fp], r2)
+        key.set_contents_from_file(fp)
         end = time.time()
         elapsed = end - start
 
@@ -64,7 +73,7 @@ def writer(bucket, name, queue, file_size=1, file_stddev=0, file_name_seed=None)
             dict(
                 type='w',
                 bucket=bucket.name,
-                #TODO this current combines stats for multiple files? key=key.name,
+                key=key.name,
                 #TODO chunks
                 start=start,
                 duration=int(round(elapsed * NANOSECOND)),