From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Wed, 20 Jul 2011 17:40:20 +0000 (-0700)
Subject: Make readwrite test put objects one by one, so it can report keys.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=deb8be995764c346ea9ad8db37111012879f27dd;p=s3-tests.git

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 16fc35e8..2b0b5895 100644
--- 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)),