[IMP] connector_carepoint: Add session reconnect handling

* Add support to reconnect sessions on certain errors
* Bump `carepoint` lib version for `_init_env` method

connector_carepoint/tests/common.py

@@ -62,6 +62,11 @@ def mock_adapter(unit):
         yield API
 
 
+class EndTestException(Exception):
+    """ It is a dummy Exception used to stop tests """
+    pass
+
+
 class CarepointHelper(object):
     """ Emulate a ConnectorEnvironment """
 
@@ -151,6 +156,7 @@ def setUp(self):
         })
         self.mock_api = mock_api
         self.mock_adapter = mock_adapter
+        self.EndTestException = EndTestException
 
     def get_carepoint_helper(self, model_name):
         return CarepointHelper(

connector_carepoint/tests/test_backend_adapter.py

@@ -16,7 +16,6 @@ class TestBackendAdapter(SetUpCarepointBase):
 
     def setUp(self):
         super(TestBackendAdapter, self).setUp()
-        backend_adapter.carepoints = {}
         self.Model = backend_adapter.CarepointCRUDAdapter
 
     def _init_model(self, model='carepoint.carepoint.store'):
@@ -52,6 +51,42 @@ def test_init_assigns_instance(self):
             res = self._init_model()
             self.assertEqual(expect, res.carepoint)
 
+    def test_get_cp_model_resets(self):
+        """ It should guard a reconnectable exception and clear globals """
+        with self.mock_api():
+            model = self._init_model()
+            model.carepoint = mock.MagicMock()
+            model.carepoint.__getitem__.side_effect = [
+                model.RECONNECT_EXCEPTIONS[0],
+            ]
+            model.carepoint._init_env.side_effect = self.EndTestException
+            with self.assertRaises(self.EndTestException):
+                model.search()
+
+    def test_get_cp_model_recurse(self):
+        """ It should recurse when reconnectable exception is identified """
+        with self.mock_api():
+            model = self._init_model()
+            model.carepoint = mock.MagicMock()
+            model.carepoint.__getitem__.side_effect = [
+                model.RECONNECT_EXCEPTIONS[0],
+                self.EndTestException,
+            ]
+            with self.assertRaises(self.EndTestException):
+                model.search()
+
+    def test_get_cp_model_raise(self):
+        """ It should guard a reconnectable exception and clear globals """
+        with self.mock_api():
+            model = self._init_model()
+            model.carepoint = mock.MagicMock()
+            model.carepoint.__getitem__.side_effect = [
+                model.RECONNECT_EXCEPTIONS[0],
+                model.RECONNECT_EXCEPTIONS[0],
+            ]
+            with self.assertRaises(model.RECONNECT_EXCEPTIONS[0]):
+                model.search()
+
     def test_search_gets_pks(self):
         """ It should get the primary keys of the db """
         with self.mock_api() as api:

connector_carepoint/unit/backend_adapter.py

@@ -4,6 +4,11 @@
 
 from openerp.addons.connector.unit.backend_adapter import CRUDAdapter
 
+try:
+    from sqlalchemy.exc import InvalidRequestError
+except ImportError:
+    pass
+
 try:
     from carepoint import Carepoint
 except ImportError:
@@ -13,6 +18,10 @@
 class CarepointCRUDAdapter(CRUDAdapter):
     """ External Records Adapter for Carepoint """
 
+    RECONNECT_EXCEPTIONS = [
+        InvalidRequestError,
+    ]
+
     def __init__(self, connector_env):
         """ Ready the DB adapter
         :param connector_env: current environment (backend, session, ...)
@@ -36,13 +45,19 @@ def __to_camel_case(self, snake_case):
         parts = snake_case.split('_')
         return "".join(x.title() for x in parts)
 
-    def __get_cp_model(self):
+    def __get_cp_model(self, retry=True):
         """ Get the correct model object by name from Carepoint lib
         :rtype: :class:`sqlalchemy.schema.Table`
         """
         name = self.connector_env.model._cp_lib
         camel_name = self.__to_camel_case(name)
-        return self.carepoint[camel_name]
+        try:
+            return self.carepoint[camel_name]
+        except tuple(self.RECONNECT_EXCEPTIONS):
+            if retry:
+                self.carepoint._init_env(True)
+                return self.__get_cp_model(False)
+            raise
 
     def search(self, **filters):
         """ Search table by filters and return record ids

requirements.txt

@@ -2,4 +2,4 @@ pint>=0.7.2
 SQLAlchemy>=1.1.1
 pysmb>=1.1.18
 phonenumbers>=7.7.2
-carepoint>=0.1.3.dev170
+carepoint>=0.1.7

test_requirements.txt

@@ -11,4 +11,4 @@ xmlrunner>=1.7.7
 pysmb>=1.1.18
 pint>=0.7.2
 phonenumbers>=7.7.2
-carepoint>=0.1.3.dev170
+carepoint>=0.1.7