Implement livetest to check connection pool lock

diff --git a/kamaki/clients/connection/test.py b/kamaki/clients/connection/test.py
index 7978e8a..26689a2 100644 (file)
--- a/kamaki/clients/connection/test.py
+++ b/kamaki/clients/connection/test.py
@@ -205,8 +205,8 @@ class KamakiHTTPResponse(TestCase):
                 self.assertEquals(loads(sample2), self.resp.json)
 
     def test_pool_lock(self):
-        conn_num = 2000
-        for i in range(conn_num):
+        exceptions_left = 100
+        while exceptions_left:
             kre = errors.KamakiResponseError
             with patch.object(self.HTC, 'close', return_value=True):
                 self.resp = kamakicon.KamakiHTTPResponse(self.HTC('X', 'Y'))
@@ -224,7 +224,9 @@ class KamakiHTTPResponse(TestCase):
                         try:
                             self.resp.text
                         except kre:
-                            pass
+                            exceptions_left -= 1
+                        else:
+                            self.assertTrue(False)
                 self.HTC.close.assert_called_with()
 
 

diff --git a/kamaki/clients/livetest/__init__.py b/kamaki/clients/livetest/__init__.py
index a14344a..587f119 100644 (file)
--- a/kamaki/clients/livetest/__init__.py
+++ b/kamaki/clients/livetest/__init__.py
@@ -169,8 +169,56 @@ def init_parser():
     return parser
 
 
+class Connection(Generic):
+
+    def setUp(self):
+        from kamaki.clients.connection import kamakicon
+        self.conn = kamakicon.KamakiHTTPConnection
+        self.resp = kamakicon.KamakiHTTPResponse
+        self.rerr = kamakicon.KamakiResponseError
+        self.url = self['store', 'url']
+        self.token = self['store', 'token']
+
+    def test_000(self):
+        exceptions_left = 9
+        from random import randrange
+        from httplib import HTTPSConnection
+        from mock import patch
+        connection = self.conn(url=self.url)
+        tries = 0
+        while exceptions_left:
+            from time import sleep
+            sleep(0.5)
+            tries += 1
+            print('Try connection #%s' % tries)
+            response = connection.perform_request('GET', async_headers={
+                'X-Auth-Token': self.token})
+            with patch.object(response.request, 'close', return_value=None):
+                if randrange(2):
+                    response.release()
+                    #self.assertTrue(len(text) > 0)
+                else:
+                    print('\tRaise artificial exception (%s left)' % (
+                        exceptions_left - 1))
+                    with patch.object(
+                            HTTPSConnection,
+                            'getresponse',
+                            side_effect=self.rerr('A random error')):
+                        try:
+                            response.text
+                        except self.rerr:
+                            exceptions_left -= 1
+                        else:
+                            assert False, 'Exception not raised as expected'
+                response.request.close.assert_called_once_with()
+            response.request.close()
+
+
 def main(argv, config=None):
     suiteFew = TestSuite()
+    if len(argv) == 0 or argv[0] == 'connection':
+        test_method = 'test_%s' % (argv[1] if len(argv) > 1 else '000')
+        suiteFew.addTest(Connection(test_method, config))
     if len(argv) == 0 or argv[0] == 'pithos':
         from kamaki.clients.livetest.pithos import Pithos
         test_method = 'test_%s' % (argv[1] if len(argv) > 1 else '000')