Correctly generate non-mod 1024 parts in generator

Also move implementation to utils and add unit tests.

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index d243d2a8ecb603c286f7a94a6396e72efcff560f..e1c55fb370608093168d17ee0d8acc7b448ec8de 100644 (file)
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -9,8 +9,6 @@ import email.utils
 import isodate
 import nose
 import operator
-import random
-import string
 import socket
 import ssl
 import os
@@ -31,6 +29,7 @@ from nose.plugins.attrib import attr
 from nose.plugins.skip import SkipTest
 
 from .utils import assert_raises
+from .utils import generate_random
 from .utils import region_sync_meta
 import AnonymousAuth
 
@@ -4288,24 +4287,6 @@ def transfer_part(bucket, mp_id, mp_keyname, i, part):
     part_out = StringIO(part)
     mp.upload_part_from_file(part_out, i+1)
 
-def generate_random(size, part_size=5*1024*1024):
-    """
-    Generate the specified number random data.
-    (actually each MB is a repetition of the first KB)
-    """
-    chunk = 1024
-    allowed = string.ascii_letters
-    for x in range(0, size, part_size):
-        strpart = ''.join([allowed[random.randint(0, len(allowed) - 1)] for _ in xrange(chunk)])
-        s = ''
-        left = size - x
-        this_part_size = min(left, part_size)
-        for y in range(this_part_size / chunk):
-            s = s + strpart
-        yield s
-        if (x == size):
-            return
-
 def _multipart_upload(bucket, s3_key_name, size, part_size=5*1024*1024, do_list=None, headers=None, metadata=None):
     """
     generate a multi-part upload for a random file of specifed size,

diff --git a/s3tests/functional/test_utils.py b/s3tests/functional/test_utils.py
new file mode 100644 (file)
index 0000000..70cf99a
--- /dev/null
+++ b/s3tests/functional/test_utils.py
@@ -0,0 +1,11 @@
+from nose.tools import eq_ as eq
+
+import utils
+
+def test_generate():
+    FIVE_MB = 5 * 1024 * 1024
+    eq(len(''.join(utils.generate_random(0))), 0)
+    eq(len(''.join(utils.generate_random(1))), 1)
+    eq(len(''.join(utils.generate_random(FIVE_MB - 1))), FIVE_MB - 1)
+    eq(len(''.join(utils.generate_random(FIVE_MB))), FIVE_MB)
+    eq(len(''.join(utils.generate_random(FIVE_MB + 1))), FIVE_MB + 1)

diff --git a/s3tests/functional/utils.py b/s3tests/functional/utils.py
index 8852cfaf1be733588b991c05a535a85154dde172..cb507ce07087e81652dfe0ce8bd87bac7d64aa25 100644 (file)
--- a/s3tests/functional/utils.py
+++ b/s3tests/functional/utils.py
@@ -1,4 +1,6 @@
+import random
 import requests
+import string
 import time
 
 from nose.tools import eq_ as eq
@@ -18,6 +20,25 @@ def assert_raises(excClass, callableObj, *args, **kwargs):
             excName = str(excClass)
         raise AssertionError("%s not raised" % excName)
 
+def generate_random(size, part_size=5*1024*1024):
+    """
+    Generate the specified number random data.
+    (actually each MB is a repetition of the first KB)
+    """
+    chunk = 1024
+    allowed = string.ascii_letters
+    for x in range(0, size, part_size):
+        strpart = ''.join([allowed[random.randint(0, len(allowed) - 1)] for _ in xrange(chunk)])
+        s = ''
+        left = size - x
+        this_part_size = min(left, part_size)
+        for y in range(this_part_size / chunk):
+            s = s + strpart
+        s = s + strpart[:(this_part_size % chunk)]
+        yield s
+        if (x == size):
+            return
+
 # syncs all the regions except for the one passed in
 def region_sync_meta(targets, region):