more tests and some polishing

Author: mredolatti

splitio/push/manager.py

@@ -159,23 +159,6 @@ def _setup_next_token_refresh(self, token):
         self._next_refresh.setName('TokenRefresh')
         self._next_refresh.start()
 
-    def _handle_connection_ready(self):
-        """Handle a successful connection to SSE."""
-        self._feedback_loop.put(Status.PUSH_SUBSYSTEM_UP)
-        _LOGGER.info('sse initial event received. enabling')
-
-    def _handle_connection_end(self, shutdown_requested):
-        """
-        Handle a connection ending.
-
-        If the connection shutdown was not requested, trigger a restart.
-
-        :param shutdown_requested: whether the shutdown was requested or unexpected.
-        :type shutdown_requested: True
-        """
-        if not shutdown_requested:
-            self._feedback_loop.put(Status.PUSH_RETRYABLE_ERROR)
-
     def _handle_message(self, event):
         """
         Handle incoming update message.
@@ -237,3 +220,18 @@ def _handle_error(self, event):
         feedback = self._status_tracker.handle_ably_error(event)
         if feedback is not None:
             self._feedback_loop.put(feedback)
+
+    def _handle_connection_ready(self):
+        """Handle a successful connection to SSE."""
+        self._feedback_loop.put(Status.PUSH_SUBSYSTEM_UP)
+        _LOGGER.info('sse initial event received. enabling')
+
+    def _handle_connection_end(self):
+        """
+        Handle a connection ending.
+
+        If the connection shutdown was not requested, trigger a restart.
+        """
+        feedback = self._status_tracker.handle_disconnect()
+        if feedback is not None:
+            self._feedback_loop.put(feedback)

splitio/push/parser.py

@@ -1,13 +1,13 @@
 """SSE Notification definitions."""
 import abc
 import json
-import time
 from enum import Enum
 
 from future.utils import raise_from
 from six import add_metaclass
 
 from splitio.util.decorators import abstract_property
+from splitio.util import utctime_ms
 from splitio.push.sse import SSE_EVENT_ERROR, SSE_EVENT_MESSAGE
 
 
@@ -89,7 +89,7 @@ def __init__(self, code, status_code, message, href):
         self._status_code = status_code
         self._message = message
         self._href = href
-        self._timestamp = int(time.time() * 1000)  # TODO: replace with UTC function after merge
+        self._timestamp = utctime_ms()
 
     @property
     def event_type(self):  #pylint:disable=no-self-use

splitio/push/splitsse.py

@@ -117,13 +117,12 @@ def start(self, token):
 
         def connect(url):
             """Connect to sse in a blocking manner."""
-            shutdown_requested = False
             try:
-                shutdown_requested = self._client.start(url, timeout=self.KEEPALIVE_TIMEOUT)
+                self._client.start(url, timeout=self.KEEPALIVE_TIMEOUT)
             finally:
                 self._status = SplitSSEClient._Status.IDLE
                 self._sse_connection_closed.set()
-                self._on_disconnected(shutdown_requested)
+                self._on_disconnected()
 
         url = self._build_url(token)
         task = threading.Thread(target=connect, name='SSEConnection', args=(url,))

splitio/push/status_tracker.py

@@ -17,7 +17,7 @@ class Status(Enum):
     PUSH_NONRETRYABLE_ERROR = 3
 
 
-class LastEventTimestamps(object):
+class LastEventTimestamps(object):  # pylint:disable=too-few-public-methods
     """Simple class to keep track of the last time multiple events occurred."""
 
     def __init__(self):
@@ -110,10 +110,10 @@ def handle_ably_error(self, event):
         :returns: A new status if required. None otherwise
         :rtype: Optional[Status]
         """
-        if self._shutdown_expected:  # we don't care about occupancy if a disconnection is expected
+        if self._shutdown_expected:  # we don't care about an incoming error if a shutdown is expected
             return None
 
-        _LOGGER.debug('handling update event: %s', str(event))
+        _LOGGER.debug('handling ably error event: %s', str(event))
         if event.should_be_ignored():
             _LOGGER.debug('ignoring sse error message: %s', event)
             return None
@@ -160,7 +160,7 @@ def _update_status(self):
 
         return None
 
-    def _handle_disconnect(self):
+    def handle_disconnect(self):
         """
         Handle non-requested SSE disconnection.
 

splitio/version.py

@@ -1 +1 @@
-__version__ = '8.3.0-rc3'
+__version__ = '8.3.0-rc5'

tests/push/test_manager.py

@@ -67,7 +67,7 @@ def test_connection_failure(self, mocker):
 
         def new_start(*args, **kwargs):  # pylint: disable=unused-argument
             """splitsse.start mock."""
-            thread = Thread(target=manager._handle_connection_end, args=(False,))
+            thread = Thread(target=manager._handle_connection_end)
             thread.setDaemon(True)
             thread.start()
             return False

tests/push/test_splitsse.py

@@ -22,17 +22,15 @@ def handler(event):
         status = {
             'on_connect': False,
             'on_disconnect': False,
-            'requested': False
         }
 
         def on_connect():
             """On connect handler."""
             status['on_connect'] = True
 
-        def on_disconnect(requested):
+        def on_disconnect():
             """On disconnect handler."""
             status['on_disconnect'] = True
-            status['requested'] = requested
 
         request_queue = Queue()
         server = SSEMockServer(request_queue)
@@ -68,7 +66,6 @@ def on_disconnect(requested):
 
         assert status['on_connect']
         assert status['on_disconnect']
-        assert status['requested']
 
     def test_split_sse_error(self):
         """Test correct initialization. Client ends the connection."""
@@ -84,17 +81,15 @@ def handler(event):
         status = {
             'on_connect': False,
             'on_disconnect': False,
-            'requested': False
         }
 
         def on_connect():
             """On connect handler."""
             status['on_connect'] = True
 
-        def on_disconnect(requested):
+        def on_disconnect():
             """On disconnect handler."""
             status['on_disconnect'] = True
-            status['requested'] = requested
 
         client = SplitSSEClient(handler, on_connect, on_disconnect,
                                 base_url='http://localhost:' + str(server.port()))
@@ -116,4 +111,3 @@ def on_disconnect(requested):
 
         assert status['on_connect']
         assert status['on_disconnect']
-        assert not status['requested']