From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Tue, 26 Jul 2011 16:33:47 +0000 (-0700)
Subject: Revert "adding max_amount to realistic.names generator"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b204bfbdc1d1312a2697e7ccd01aeb862e19294;p=s3-tests.git

Revert "adding max_amount to realistic.names generator"

This is now unused code.

This reverts commit 52ba1d4fbf9b3547f8fd27199cf2c4f2c59dbd45.
---

diff --git a/s3tests/realistic.py b/s3tests/realistic.py
index 458fa08b..32511365 100644
--- a/s3tests/realistic.py
+++ b/s3tests/realistic.py
@@ -137,13 +137,12 @@ def files(mean, stddev, seed=None):
                 break
         yield RandomContentFile(size=size, seed=rand.getrandbits(32))
 
-def names(mean, stddev, charset=None, seed=None, max_amount=None):
+def names(mean, stddev, charset=None, seed=None):
     """
     Yields strings that are somewhat plausible as file names, where
     the lenght of each filename follows the normal distribution with
     `mean` and `stddev`.
     """
-    count = 0
     if charset is None:
         charset = string.ascii_lowercase
     rand = random.Random(seed)
@@ -155,11 +154,6 @@ def names(mean, stddev, charset=None, seed=None, max_amount=None):
         name = ''.join(rand.choice(charset) for _ in xrange(length))
         yield name
 
-        count += 1
-        if count == max_amount:
-            return
-
-
 def files_varied(groups, unlimited=False):
     """ Yields a weighted-random selection of file-like objects. """
     # Quick data type sanity.