s3-tests.diff

From 37037a38000a12e77d858365dcbe4a073b529999 Mon Sep 17 00:00:00 2001
From: Yuan Zhou <yuan.zhou@intel.com>
Date: Fri, 28 Aug 2015 09:07:21 +0800
Subject: [PATCH 1/1] Update for internal use

delete http proxy before creating
bump gevent version in requirement

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---
 requirements.txt     | 2 +-
 s3tests/readwrite.py | 7 ++++---
 s3tests/roundtrip.py | 6 +++---
 setup.py             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9c294dc..7f1348a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ nose >=1.0.0
 boto >=2.6.0
 bunch >=1.0.0
 # 0.14 switches to libev, that means bootstrap needs to change too
-gevent ==0.13.6
+gevent >=1.0
 isodate >=0.4.4
 requests ==0.14.0
 pytz >=2011k
diff --git a/s3tests/readwrite.py b/s3tests/readwrite.py
index 8e59f7e..48f61bd 100644
--- a/s3tests/readwrite.py
+++ b/s3tests/readwrite.py
@@ -195,7 +196,7 @@ def main():
             warmup_pool = gevent.pool.Pool(size=100)
             for file_name in file_names:
                 fp = next(files)
-                warmup_pool.spawn_link_exception(
+                warmup_pool.spawn(
                     write_file,
                     bucket=bucket,
                     file_name=file_name,
@@ -214,7 +215,7 @@ def main():
         if not config.readwrite.get('deterministic_file_names'):
             for x in xrange(config.readwrite.writers):
                 this_rand = random.Random(rand_writer.randrange(2**32))
-                group.spawn_link_exception(
+                group.spawn(
                     writer,
                     bucket=bucket,
                     worker_id=x,
@@ -231,7 +232,7 @@ def main():
         rand_reader = random.Random(seeds['reader'])
         for x in xrange(config.readwrite.readers):
             this_rand = random.Random(rand_reader.randrange(2**32))
-            group.spawn_link_exception(
+            group.spawn(
                 reader,
                 bucket=bucket,
                 worker_id=x,
diff --git a/s3tests/roundtrip.py b/s3tests/roundtrip.py
index 0279ad7..e73f8db 100644
--- a/s3tests/roundtrip.py
+++ b/s3tests/roundtrip.py
@@ -161,7 +161,7 @@ def main():
             )
         q = gevent.queue.Queue()
 
-        logger_g = gevent.spawn_link_exception(yaml.safe_dump_all, q, stream=real_stdout)
+        logger_g = gevent.spawn(yaml.safe_dump_all, q, stream=real_stdout)
 
         print "Writing {num} objects with {w} workers...".format(
             num=config.roundtrip.files.num,
@@ -171,7 +171,7 @@ def main():
         start = time.time()
         for objname in objnames:
             fp = next(files)
-            pool.spawn_link_exception(
+            pool.spawn(
                 writer,
                 bucket=bucket,
                 objname=objname,
@@ -195,7 +195,7 @@ def main():
         pool = gevent.pool.Pool(size=config.roundtrip.readers)
         start = time.time()
         for objname in objnames:
-            pool.spawn_link_exception(
+            pool.spawn(
                 reader,
                 bucket=bucket,
                 objname=objname,
diff --git a/setup.py b/setup.py
index e8ead29..b514d0e 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
         'boto >=2.0b4',
         'PyYAML',
         'bunch >=1.0.0',
-        'gevent ==0.13.6',
+        'gevent >=1.0',
         'isodate >=0.4.4',
         ],
 
-- 
1.9.1