Merge lp:~alecu/ubuntuone-client/status-changed into lp:ubuntuone-client

[Alejandro J. Cura]

Connect the signal for status changed (LP: #806655)

Connect the signal for status changed (LP: #806655)

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'tests/platform/windows/test_ipc.py'
--- tests/platform/windows/test_ipc.py	2011-07-13 19:55:31 +0000
+++ tests/platform/windows/test_ipc.py	2011-07-15 17:38:24 +0000
@@ -3049,7 +3049,8 @@
         self.action_queue = self.mocker.mock()
         self.fs_manager = self.mocker.mock()
         self.volume_manager = self.mocker.mock()
-        self.ipc_root = IPCRoot(self.main)
+        self.ipc_interface = self.mocker.mock()
+        self.ipc_root = IPCRoot(self.ipc_interface, self.main)
         self.server_factory = SaveProtocolServerFactory(self.ipc_root)
         self.listener = ipc_server_listen(self.server_factory)
         self.client_factory = PBClientFactory()
@@ -3235,9 +3236,10 @@
 class FakeIPCRoot(object, ipc.Root):
     """A Fake IPC Root."""
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, ipc_interface, *args, **kwargs):
         """Initialize this fake instance."""
-        # This empty method is needed to override the default constructor
+        # just save the ipc_interface
+        self.ipc_interface = ipc_interface
 
 
 class RandomException(Exception):
@@ -3316,6 +3318,10 @@
 
     cmt_class = FakeCredentialsManagementTool
 
+    def test_ipc_root_created_ok(self):
+        """The IPCRoot is passed the IPCInterface."""
+        self.assertEqual(self.ipc.root.ipc_interface, self.ipc)
+
     @defer.inlineCallbacks
     def test_connect(self):
         """Test the connect method."""

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-07-06 16:32:37 +0000
+++ tests/platform/windows/test_tools.py	2011-07-15 17:38:24 +0000
@@ -137,6 +137,8 @@
         self.server_factory = SaveProtocolServerFactory(self.syncdaemon_root)
         # pylint: disable=E1101
         self.patch(ipc, "HOST_PORT", TEST_TOOLS_HOST_PORT)
+        self.patch(ipc.ActivationClient, "get_active_port",
+                             lambda _: defer.succeed(TEST_TOOLS_HOST_PORT[1]))
         self.listener = ipc_server_listen(self.server_factory)
         self.sdtool = SyncDaemonTool()
 
@@ -1099,6 +1101,15 @@
         # pylint: enable=E1101
         return d
 
+    @defer.inlineCallbacks
+    def test_set_status_changed_handler(self):
+        """The status handler is changed."""
+        test_handler = object()
+        sdtool = yield self._connect()
+        yield sdtool.set_status_changed_handler(test_handler)
+        self.assertEqual(sdtool.client.status.on_status_changed_cb,
+                         test_handler)
+
     def test_start(self):
         """Test that we can indeed start the process."""
         cmd = 'notepad'

=== modified file 'ubuntuone/platform/windows/ipc.py'
--- ubuntuone/platform/windows/ipc.py	2011-07-13 19:55:31 +0000
+++ ubuntuone/platform/windows/ipc.py	2011-07-15 17:38:24 +0000
@@ -157,6 +157,7 @@
 
     def emit_signal(self, signal_name, *args, **kwargs):
         """Emit the given signal to the clients."""
+        logger.debug("emitting %r to all connected clients.", signal_name)
         for current_client in self.clients:
             try:
                 d = current_client.callRemote(signal_name, *args, **kwargs)
@@ -956,7 +957,8 @@
         'get_folders',
         'get_public_files']
 
-    def __init__(self, main, send_events=False, all_events=AllEventsSender):
+    def __init__(self, ipc_interface, main, send_events=False,
+                 all_events=AllEventsSender):
         """Create a new instance that will expose the objects."""
         super(IPCRoot, self).__init__()
         self.main = main
@@ -975,7 +977,7 @@
             self.all_events_sender = all_events(self.events)
             self.event_queue.subscribe(self.all_events_sender)
 
-        self.sync = SyncDaemon(self, self.main, self.volume_manager,
+        self.sync = SyncDaemon(ipc_interface, self.main, self.volume_manager,
                                self.action_queue)
         self.fs = FileSystem(self.fs_manager, self.action_queue)
         self.shares = Shares(self.fs_manager, self.volume_manager)
@@ -1027,7 +1029,7 @@
         specified bus.
         """
         super(IPCInterface, self).__init__()
-        self.root = IPCRoot(main, send_events)
+        self.root = IPCRoot(self, main, send_events)
         self.listener = ipc_server_listen(PBServerFactory(self.root))
         self.main = main
 

=== modified file 'ubuntuone/platform/windows/tools.py'
--- ubuntuone/platform/windows/tools.py	2011-07-12 04:37:51 +0000
+++ ubuntuone/platform/windows/tools.py	2011-07-15 17:38:24 +0000
@@ -566,3 +566,7 @@
         """Return the shares link directory."""
         return self.client.sync_daemon.get_sharesdir_link()
 
+    def set_status_changed_handler(self, handler):
+        """Set the status changed handler."""
+        self.client.status.on_status_changed_cb = handler
+        return defer.succeed(None)

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2011-06-28 15:55:19 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2011-07-15 17:38:24 +0000
@@ -929,6 +929,7 @@
 
     def handle_SYS_STATE_CHANGED(self, state):
         """Handle SYS_STATE_CHANGED."""
+        logger.debug('emitting state changed: %r', state)
         self.interface.status.emit_status_changed(state)
 
     def handle_SV_FREE_SPACE(self, share_id, free_bytes):