Merge lp:~facundo/ubuntuone-client/support-initial-disconnection into lp:ubuntuone-client

[Facundo Batista]

Support connection ended in initial dialog with server (LP: #711211).

Support connection ended in initial dialog with server.

Tests included.

[Guillermo Gonzalez (verterok)]

review: Approve

[Facundo Batista (facundo)]

Approved with one review

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-03-29 15:23:30 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-04-06 13:45:55 +0000
@@ -3845,6 +3845,30 @@
                                                 event, str(exc)))
 
     @defer.inlineCallbacks
+    def assert_send_request_and_handle_errors_on_connection_end(self, exc):
+        """_send_request_and_handle_errors is ok when connection lost/done."""
+        request = self.fail_please(exc)
+        kwargs = dict(request=request, request_error=SpecificException,
+                      event_error='BAR', event_ok='FOO')
+        d = self.action_queue._send_request_and_handle_errors(**kwargs)
+        yield d
+
+        # check that SYS_UNKNOWN_ERROR wasn't sent, and that logged ok
+        events = self.action_queue.event_queue.events
+        self.assertNotIn('SYS_UNKNOWN_ERROR', [x[0] for x in events])
+        self.assertTrue(self.handler.check_info(request.__name__, str(exc)))
+
+    def test_send_request_and_handle_errors_on_connection_lost(self):
+        """_send_request_and_handle_errors is correct when connection lost."""
+        e = twisted_error.ConnectionLost()
+        return self.assert_send_request_and_handle_errors_on_connection_end(e)
+
+    def test_send_request_and_handle_errors_on_connection_done(self):
+        """_send_request_and_handle_errors is correct when connection lost."""
+        e = twisted_error.ConnectionDone()
+        return self.assert_send_request_and_handle_errors_on_connection_end(e)
+
+    @defer.inlineCallbacks
     def assert_send_request_and_handle_errors_on_server_error(self, serr):
         """_send_request_and_handle_errors is correct when server error."""
         # XXX: we need to replace this list with and exception list

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-03-29 15:23:30 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-04-06 13:45:55 +0000
@@ -881,6 +881,12 @@
         except request_error, failure:
             event = event_error
             self.event_queue.push(event_error, error=str(failure))
+        except (twisted_errors.ConnectionLost,
+                twisted_errors.ConnectionDone), failure:
+            # connection ended, just don't do anything: the SYS_CONNECTION_ETC
+            # will be sent by normal client/protocol mechanisms, and logging
+            # will be done later in this function.
+            pass
         except protocol_errors.AuthenticationRequiredError, failure:
             # we need to separate this case from the rest because an
             # AuthenticationRequiredError is an StorageRequestError,
@@ -902,9 +908,13 @@
                 self.event_queue.push(event_ok)
 
         if failure is not None:
-            logger.info("The request '%s' failed with the error: %s "
-                        "and was handled with the event: %s",
-                         req_name, failure, event)
+            if event is None:
+                logger.info("The request '%s' failed with the error: %s",
+                             req_name, failure)
+            else:
+                logger.info("The request '%s' failed with the error: %s "
+                            "and was handled with the event: %s",
+                            req_name, failure, event)
         else:
             defer.returnValue(result)