Merge lp:~alecu/ubuntuone-control-panel/use-status-changed into lp:ubuntuone-control-panel

[Alejandro J. Cura]

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

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

[Natalia Bidart (nataliabidart)]

Can you please replace

if not sys.platform.startswith("linux"):

with the decorator from devtools for skip a test in a given os.

Also,

ubuntuone/controlpanel/sd_client/__init__.py:238:5: E301 expected 1 blank line, found 0

review: Needs Fixing

[lp:~alecu/ubuntuone-control-panel/use-status-changed]

184. By Alejandro J. Cura on 2011-07-15

fixed review comments

185. By Alejandro J. Cura on 2011-07-15

and now a lint fix

[Natalia Bidart (nataliabidart)]

Thanks! It looks great.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-06-29 18:15:57 +0000
+++ ubuntuone/controlpanel/backend.py	2011-07-15 21:48:38 +0000
@@ -144,6 +144,7 @@
         * MSG_KEY: a non translatable but human readable string of the status.
 
         """
+        logger.debug('sync status: %r', status)
         if not status:
             self.file_sync_disabled = True
             return self.STATUS_DISABLED

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-07-14 17:57:17 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-07-15 21:48:38 +0000
@@ -118,7 +118,6 @@
 
         self._backend_method = None
         self.backend = backend.ControlBackend()
-        self.backend.status_changed_handler = self.process_info
 
         logger.debug('%s: started.', self.__class__.__name__)
 
@@ -135,6 +134,7 @@
         """Load specific tab info."""
         info = yield self.backend.file_sync_status()
         self.process_info(info)
+        self.backend.status_changed_handler = self.process_info
 
     @log_call(logger.debug)
     def process_info(self, status):

=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py	2011-06-29 19:11:15 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py	2011-07-15 21:48:38 +0000
@@ -234,3 +234,8 @@
 if sys.platform.startswith("linux"):
     from ubuntuone.controlpanel.sd_client.linux \
     import set_status_changed_handler
+else:
+
+    def set_status_changed_handler(handler):
+        """Set the status handler function."""
+        return get_syncdaemon_tool().set_status_changed_handler(handler)

=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2011-06-29 19:01:50 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2011-07-15 21:48:38 +0000
@@ -19,11 +19,12 @@
 
 """Tests for the service when accessing SyncDaemon."""
 
+import os
 import uuid
-import os
 
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks, returnValue
+from ubuntuone.devtools.testcase import skipIfNotOS
 # No name 'tools' in module 'ubuntuone.platform'
 # pylint: disable=E0611
 from ubuntuone.platform import tools
@@ -310,6 +311,10 @@
         """Return the shares link directory."""
         return self.shares_dir_link
 
+    def set_status_changed_handler(self, handler):
+        """Set the handler for the status changed signal."""
+        self.called['status_changed_handler'] = handler
+
 
 class BaseTestCase(TestCase):
     """Test for the syncdaemon client methods."""
@@ -688,6 +693,15 @@
 
         self.assertEqual(FakedSyncDaemonTool.called['quit'], None)
 
+    @skipIfNotOS('win32', 'The tested function is only defined on windows')
+    @inlineCallbacks
+    def test_set_status_changed_handler(self):
+        """Connect a handler to the status changed signal."""
+        sample_handler = object()
+        yield sd_client.set_status_changed_handler(sample_handler)
+        self.assertEqual(sample_handler,
+                   FakedSyncDaemonTool.called['status_changed_handler'])
+
 
 class BasicTestCase(BaseTestCase):
     """Test for the basic syncdaemon client methods."""