Merge lp:~nataliabidart/ubuntuone-control-panel/disable-files into lp:ubuntuone-control-panel

[Natalia Bidart]

- Unify disable/enable file sync functionality among Services tab and global file sync status (LP: #729301).
- Cloud Folders tab is now disabled when the file sync service is (LP: #747482).

In order to test, you need to be running ubuntuone-client revno 932 or higher.

Then, using 2 terminals, you should:

1$> DEBUG=True PYTHONPATH=~/path/to/u1/client/revno-932-or-higher/:. ./bin/ubuntuone-control-panel-backend

2$> DEBUG=True PYTHONPATH=~/path/to/u1/client/revno-932-or-higher/:. ./bin/ubuntuone-control-panel-gtk

Go to the services tab and play with the 'enable file sync' checkbox. The global file sync status bar should be updated properly.
Go

[lp:~nataliabidart/ubuntuone-control-panel/disable-files]

122. By Natalia Bidart on 2011-04-04

Cloud Folders tab is now disabled when the file sync service is (LP: #747482).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Chad Miller (cmiller)]

review: Approve

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-03-31 21:11:39 +0000
+++ ubuntuone/controlpanel/backend.py	2011-04-04 18:22:45 +0000
@@ -78,6 +78,7 @@
     FOLDER_TYPE = u'UDF'
     SHARE_TYPE = u'SHARE'
     NAME_NOT_SET = u'ENAMENOTSET'
+    STATUS_DISABLED = {MSG_KEY: '', STATUS_KEY: FILE_SYNC_DISABLED}
 
     def __init__(self, shutdown_func=None):
         """Initialize the webclient."""
@@ -87,6 +88,7 @@
         self.status_changed_handler = lambda *a: None
 
         self._volumes = {}  # cache last known volume info
+        self.file_sync_disabled = False
 
     def _process_file_sync_status(self, status):
         """Process raw file sync status into custom format.
@@ -100,7 +102,8 @@
 
         """
         if not status:
-            return {MSG_KEY: '', STATUS_KEY: FILE_SYNC_DISABLED}
+            self.file_sync_disabled = True
+            return self.STATUS_DISABLED
 
         msg = '%s (%s)' % (status['description'], status['name'])
         result = {MSG_KEY: msg}
@@ -124,6 +127,7 @@
         elif is_disconnected:
             result[STATUS_KEY] = FILE_SYNC_DISCONNECTED
         elif is_starting:
+            self.file_sync_disabled = False
             result[STATUS_KEY] = FILE_SYNC_STARTING
         elif is_stopped:
             result[STATUS_KEY] = FILE_SYNC_STOPPED
@@ -131,7 +135,10 @@
             logger.warning('file_sync_status: unknown (got %r)', status)
             result[STATUS_KEY] = FILE_SYNC_UNKNOWN
 
-        return result
+        if self.file_sync_disabled:
+            return self.STATUS_DISABLED
+        else:
+            return result
 
     def _set_status_changed_handler(self, handler):
         """Set 'handler' to be called when file sync status changes."""
@@ -370,12 +377,14 @@
     def enable_files(self):
         """Enable the files service."""
         yield dbus_client.set_files_sync_enabled(True)
+        self.file_sync_disabled = False
 
     @log_call(logger.debug)
     @inlineCallbacks
     def disable_files(self):
         """Enable the files service."""
         yield dbus_client.set_files_sync_enabled(False)
+        self.file_sync_disabled = True
 
     @log_call(logger.debug)
     @inlineCallbacks

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-04-01 16:10:44 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-04 18:22:45 +0000
@@ -1051,7 +1051,8 @@
     def on_file_sync_status_changed(self, status):
         """File Sync status changed."""
         enabled = status != backend.FILE_SYNC_DISABLED
-        logger.info('FileSyncService: enabled? %r', enabled)
+        logger.info('FileSyncService: on_file_sync_status_changed: '
+                    'status %r, enabled? %r', status, enabled)
         self.check_button.set_active(enabled)
         # if service is disabled, disable the action_button
         self.action_button.set_sensitive(enabled)
@@ -1327,6 +1328,10 @@
                                        self.on_file_sync_status_error)
         self.backend.connect_to_signal('FilesStartError',
                                        self.on_files_start_error)
+        self.backend.connect_to_signal('FilesEnabled',
+                                       self.on_file_sync_status_starting)
+        self.backend.connect_to_signal('FilesDisabled',
+                                       self.on_file_sync_status_disabled)
 
         self.backend.file_sync_status(reply_handler=NO_OP,
                                       error_handler=error_handler)
@@ -1355,42 +1360,42 @@
         button.get_data('callback')(button)
 
     @log_call(logger.info)
-    def on_file_sync_status_disabled(self, msg):
+    def on_file_sync_status_disabled(self, msg=None):
         """Backend notifies of file sync status being disabled."""
         self._update_status(self.FILE_SYNC_DISABLED,
                             self.ENABLE, self.on_enable_clicked,
                             '✘', 'red', self.ENABLE_TOOLTIP)
 
     @log_call(logger.info)
-    def on_file_sync_status_starting(self, msg):
+    def on_file_sync_status_starting(self, msg=None):
         """Backend notifies of file sync status being starting."""
         self._update_status(self.FILE_SYNC_STARTING,
                             self.STOP, self.on_stop_clicked,
                             '⇅', ORANGE, self.STOP_TOOLTIP)
 
     @log_call(logger.info)
-    def on_file_sync_status_stopped(self, msg):
+    def on_file_sync_status_stopped(self, msg=None):
         """Backend notifies of file sync being stopped."""
         self._update_status(self.FILE_SYNC_STOPPED,
                             self.START, self.on_start_clicked,
                             '✘', 'red', self.START_TOOLTIP)
 
     @log_call(logger.info)
-    def on_file_sync_status_disconnected(self, msg):
+    def on_file_sync_status_disconnected(self, msg=None):
         """Backend notifies of file sync status being ready."""
         self._update_status(self.FILE_SYNC_DISCONNECTED,
                             self.CONNECT, self.on_connect_clicked,
                             '✘', 'red', self.CONNECT_TOOLTIP,)
 
     @log_call(logger.info)
-    def on_file_sync_status_syncing(self, msg):
+    def on_file_sync_status_syncing(self, msg=None):
         """Backend notifies of file sync status being syncing."""
         self._update_status(self.FILE_SYNC_SYNCING,
                             self.DISCONNECT, self.on_disconnect_clicked,
                             '⇅', ORANGE, self.DISCONNECT_TOOLTIP)
 
     @log_call(logger.info)
-    def on_file_sync_status_idle(self, msg):
+    def on_file_sync_status_idle(self, msg=None):
         """Backend notifies of file sync status being idle."""
         self._update_status(self.FILE_SYNC_IDLE,
                             self.DISCONNECT, self.on_disconnect_clicked,
@@ -1522,6 +1527,11 @@
         self.services_button.set_tooltip_text(self.SERVICES_BUTTON_TOOLTIP)
         self.services.load()
 
+        self.enable_volumes = lambda: self.volumes_button.set_sensitive(True)
+        self.disable_volumes = lambda: self.volumes_button.set_sensitive(False)
+        self.backend.connect_to_signal('FilesEnabled', self.enable_volumes)
+        self.backend.connect_to_signal('FilesDisabled', self.disable_volumes)
+
     def _update_quota(self, msg, data=None):
         """Update the quota info."""
         fraction = 0.0

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-03-04 21:43:19 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-04-04 18:22:45 +0000
@@ -1646,6 +1646,8 @@
             ('FileSyncStatusIdle', [self.ui.on_file_sync_status_idle]),
             ('FileSyncStatusError', [self.ui.on_file_sync_status_error]),
             ('FilesStartError', [self.ui.on_files_start_error]),
+            ('FilesDisabled', [self.ui.on_file_sync_status_disabled]),
+            ('FilesEnabled', [self.ui.on_file_sync_status_starting]),
         )
         for sig, handlers in matches:
             self.assertEqual(self.ui.backend._signals[sig], handlers)
@@ -1999,6 +2001,23 @@
         self.assertIsInstance(self.ui.status_label, gui.FileSyncStatus)
         self.assertIn(self.ui.status_label, self.ui.status_box.get_children())
 
+    def test_backend_file_sync_signals(self):
+        """The proper signals are connected to the backend."""
+        self.assertEqual(self.ui.backend._signals['FilesEnabled'],
+                         [self.ui.enable_volumes])
+        self.assertEqual(self.ui.backend._signals['FilesDisabled'],
+                         [self.ui.disable_volumes])
+
+    def test_enable_volumes(self):
+        """The volumes tab is properly enabled."""
+        self.ui.enable_volumes()
+        self.assertTrue(self.ui.volumes_button.get_sensitive())
+
+    def test_disable_volumes(self):
+        """The volumes tab is properly disabled."""
+        self.ui.disable_volumes()
+        self.assertFalse(self.ui.volumes_button.get_sensitive())
+
     def test_local_device_removed_is_emitted(self):
         """Signal local-device-removed is sent when DevicesPanel emits it."""
         self.ui.connect('local-device-removed', self._set_called)

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-03-31 18:40:33 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-04-04 18:22:45 +0000
@@ -683,6 +683,12 @@
 class BackendSyncStatusTestCase(BackendBasicTestCase):
     """Syncdaemon state for the backend."""
 
+    was_disabled = False
+
+    def setUp(self):
+        super(BackendSyncStatusTestCase, self).setUp()
+        self.be.file_sync_disabled = self.was_disabled
+
     def _build_msg(self):
         """Build expected message regarding file sync status."""
         return '%s (%s)' % (MockDBusClient.status['description'],
@@ -701,6 +707,7 @@
         """The syncdaemon status is processed and emitted."""
         self.patch(MockDBusClient, 'file_sync', False)
         yield self.assert_correct_status(FILE_SYNC_DISABLED, msg='')
+        self.assertTrue(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_error(self):
@@ -712,6 +719,8 @@
             'description': 'auth failed',
         }
         yield self.assert_correct_status(FILE_SYNC_ERROR)
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_starting_when_init_not_user(self):
@@ -722,6 +731,7 @@
             'name': 'INIT', 'description': 'something new',
         }
         yield self.assert_correct_status(FILE_SYNC_STARTING)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_starting_when_init_with_user(self):
@@ -732,6 +742,7 @@
             'name': 'INIT', 'description': 'something new',
         }
         yield self.assert_correct_status(FILE_SYNC_STARTING)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_starting_when_local_rescan_not_user(self):
@@ -742,6 +753,7 @@
             'name': 'LOCAL_RESCAN', 'description': 'something new',
         }
         yield self.assert_correct_status(FILE_SYNC_STARTING)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_starting_when_local_rescan_with_user(self):
@@ -752,6 +764,7 @@
             'name': 'LOCAL_RESCAN', 'description': 'something new',
         }
         yield self.assert_correct_status(FILE_SYNC_STARTING)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_starting_when_ready_with_user(self):
@@ -762,6 +775,7 @@
             'name': 'READY', 'description': 'something nicer',
         }
         yield self.assert_correct_status(FILE_SYNC_STARTING)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_disconnected(self):
@@ -774,6 +788,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_DISCONNECTED)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_disconnected_when_waiting(self):
         """The syncdaemon status is processed and emitted."""
@@ -784,6 +801,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_DISCONNECTED)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_syncing_if_online(self):
         """The syncdaemon status is processed and emitted."""
@@ -795,6 +815,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_SYNCING)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_syncing_even_if_not_online(self):
         """The syncdaemon status is processed and emitted."""
@@ -806,6 +829,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_SYNCING)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_idle(self):
         """The syncdaemon status is processed and emitted."""
@@ -817,6 +843,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_IDLE)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_stopped(self):
         """The syncdaemon status is processed and emitted."""
@@ -828,6 +857,9 @@
         }
         yield self.assert_correct_status(FILE_SYNC_STOPPED)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     @inlineCallbacks
     def test_unknown(self):
         """The syncdaemon status is processed and emitted."""
@@ -842,6 +874,9 @@
                                                  repr(MockDBusClient.status))
         self.assertTrue(has_warning)
 
+        # self.be.file_sync_disabled does not change
+        self.assertEqual(self.was_disabled, self.be.file_sync_disabled)
+
     def test_status_changed(self):
         """The file_sync_status is the status changed handler."""
         self.be.status_changed_handler = self._set_called
@@ -856,6 +891,21 @@
         self.assertEqual(self._called, ((expected_status,), {}))
 
 
+class BackendSyncStatusIfDisabledTestCase(BackendSyncStatusTestCase):
+    """Syncdaemon state for the backend when file sync is disabled."""
+
+    was_disabled = True
+
+    @inlineCallbacks
+    def assert_correct_status(self, status, msg=None):
+        """Check that the resulting status is correct."""
+        sup = super(BackendSyncStatusIfDisabledTestCase, self)
+        if status != FILE_SYNC_STARTING:
+            yield sup.assert_correct_status(FILE_SYNC_DISABLED, msg='')
+        else:
+            yield sup.assert_correct_status(status, msg=msg)
+
+
 class BackendFileSyncOpsTestCase(BackendBasicTestCase):
     """Syncdaemon operations for the backend."""
 
@@ -870,6 +920,7 @@
 
         yield self.be.enable_files()
         self.assertTrue(MockDBusClient.file_sync)
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_disable_files(self):
@@ -878,6 +929,7 @@
 
         yield self.be.disable_files()
         self.assertFalse(MockDBusClient.file_sync)
+        self.assertTrue(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_connect_files(self):
@@ -885,6 +937,7 @@
         yield self.be.connect_files()
 
         self.assertEqual(MockDBusClient.actions, ['connect'])
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_disconnect_files(self):
@@ -892,6 +945,7 @@
         yield self.be.disconnect_files()
 
         self.assertEqual(MockDBusClient.actions, ['disconnect'])
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_restart_files(self):
@@ -899,6 +953,7 @@
         yield self.be.restart_files()
 
         self.assertEqual(MockDBusClient.actions, ['stop', 'start'])
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_start_files(self):
@@ -906,6 +961,7 @@
         yield self.be.start_files()
 
         self.assertEqual(MockDBusClient.actions, ['start'])
+        self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_stop_files(self):
@@ -913,6 +969,7 @@
         yield self.be.stop_files()
 
         self.assertEqual(MockDBusClient.actions, ['stop'])
+        self.assertFalse(self.be.file_sync_disabled)
 
 
 class BackendReplicationsTestCase(BackendBasicTestCase):