Raise block upload greenlet failure error

diff --git a/kamaki/clients/pithos.py b/kamaki/clients/pithos.py
index d06a868..b44cb0b 100644 (file)
--- a/kamaki/clients/pithos.py
+++ b/kamaki/clients/pithos.py
@@ -195,6 +195,11 @@ class PithosClient(PithosRestAPI):
                 break
         gevent.joinall(flying)
 
+        failures = [r for r in flying if r.exception]
+        if len(flying):
+            details = ', '.join(['%s.%s'%(i,r) for i,r in enumerate(failures)])
+            raise ClientError(message="Block uploading failed", status=505, details=details)
+
     def upload_object(self, obj, f, size=None, hash_cb=None, upload_cb=None, etag=None,
         content_encoding=None, content_disposition=None, content_type=None, sharing=None,
         public=None):

diff --git a/kamaki/clients/tests.py b/kamaki/clients/tests.py
index 97f2d30..408c4d0 100644 (file)
--- a/kamaki/clients/tests.py
+++ b/kamaki/clients/tests.py
@@ -321,9 +321,8 @@ class testCyclades(unittest.TestCase):
                print('...ok')
 
                sys.stdout.write(' test set_firewall_profile')
-               #self._test_set_firewall_profile()      
-               print('...S K I P')
-               #print('...ok')
+               self._test_set_firewall_profile()       
+               print('...ok')
 
                sys.stdout.write(' test get_server_stats')
                self._test_get_server_stats()   

diff --git a/setup.py b/setup.py
index 22094cb..ac58090 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ from sys import version_info
 import kamaki
 
 
-required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1', 'gevent']
+required = ['ansicolors==1.0.2', 'progress==1.0.1', 'requests==0.12.1', 'gevent==0.13.6']
 
 if version_info[0:2] < (2, 7):
     required.extend(['argparse', 'ordereddict'])