From 7a98a496e4164b6aebc784629aae72b7a1e349d5 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Tue, 26 Jul 2011 09:51:06 -0700
Subject: [PATCH] Rename rand_readwrite to readwrite.

Simpler, and all the benchmarks are pretty much as pseudorandom,
in the end; that's not a relevant characteristic. The mix of read
and write operations is.

Re-run ./bootstrap to get the s3tests-test-readwrite script
regenerated to refer to the new module name.
---
 config.yaml.SAMPLE                          |  2 +-
 s3tests/{rand_readwrite.py => readwrite.py} | 10 +++++-----
 setup.py                                    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename s3tests/{rand_readwrite.py => readwrite.py} (94%)

diff --git a/config.yaml.SAMPLE b/config.yaml.SAMPLE
index 2dece1e..169acab 100644
--- a/config.yaml.SAMPLE
+++ b/config.yaml.SAMPLE
@@ -17,7 +17,7 @@ file_generation:
 ## single bucket for a set duration.
 ## Note: the readwrite tool does not need the s3.alt connection info.
 ## only s3.main is used.
-rand_readwrite:
+readwrite:
 ## The number of reader and writer worker threads. This sets how many
 ## files will be read and written concurrently.
   readers: 2
diff --git a/s3tests/rand_readwrite.py b/s3tests/readwrite.py
similarity index 94%
rename from s3tests/rand_readwrite.py
rename to s3tests/readwrite.py
index 5a52615..93001ba 100644
--- a/s3tests/rand_readwrite.py
+++ b/s3tests/readwrite.py
@@ -134,15 +134,15 @@ def main():
         common.setup()
 
         # verify all required config items are present
-        if 'rand_readwrite' not in common.config:
-            raise RuntimeError('rand_readwrite section not found in config')
-        config = common.config.rand_readwrite
+        if 'readwrite' not in common.config:
+            raise RuntimeError('readwrite section not found in config')
+        config = common.config.readwrite
         for item in ['readers', 'writers', 'duration', 'files']:
             if item not in config:
-                raise RuntimeError("Missing rand_readwrite config item: {item}".format(item=item))
+                raise RuntimeError("Missing readwrite config item: {item}".format(item=item))
         for item in ['num', 'size', 'stddev']:
             if item not in config.files:
-                raise RuntimeError("Missing rand_readwrite config item: files.{item}".format(item=item))
+                raise RuntimeError("Missing readwrite config item: files.{item}".format(item=item))
 
         # setup bucket and other objects
         bucket = common.get_new_bucket()
diff --git a/setup.py b/setup.py
index 686fadd..57d1b61 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
     entry_points={
         'console_scripts': [
             's3tests-generate-objects = s3tests.generate_objects:main',
-            's3tests-test-readwrite = s3tests.rand_readwrite:main',
+            's3tests-test-readwrite = s3tests.readwrite:main',
             's3tests-test-roundtrip = s3tests.roundtrip:main',
             ],
         },