Merge lp:~nataliabidart/ubuntuone-client/disable-properly into lp:ubuntuone-client

[Natalia Bidart]

- When requesting disabling the service, also quit the service (LP: #744980).

[Facundo Batista (facundo)]

Like it!

review: Approve

[lp:~nataliabidart/ubuntuone-client/disable-properly]

932. By Natalia Bidart on 2011-04-01

Merged trunk in.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-client/disable-properly]

933. By Natalia Bidart on 2011-04-04

Improving debug messages.

=== modified file 'tests/platform/linux/test_tools.py'
--- tests/platform/linux/test_tools.py	2011-02-28 16:24:21 +0000
+++ tests/platform/linux/test_tools.py	2011-04-04 15:36:35 +0000
@@ -520,6 +520,70 @@
         self.assertFalse(enabled)
 
     @defer.inlineCallbacks
+    def test_is_files_sync_enabled(self):
+        """Test for is_files_sync_enabled."""
+        yield self.tool.enable_files_sync(False)
+        enabled = yield self.tool.is_files_sync_enabled()
+        self.assertFalse(enabled)
+
+        yield self.tool.enable_files_sync(True)
+        enabled = yield self.tool.is_files_sync_enabled()
+        self.assertTrue(enabled)
+
+    @defer.inlineCallbacks
+    def test_enable_files_sync(self):
+        """Test for enable_files_sync."""
+        yield self.tool.enable_files_sync(True)
+        enabled = yield self.tool.is_files_sync_enabled()
+        self.assertTrue(enabled)
+
+    @defer.inlineCallbacks
+    def test_enable_files_sync_when_disabled(self):
+        """Test for enable_files_sync."""
+        called = []
+        self.patch(self.tool, 'start', lambda: called.append('start'))
+        yield self.tool.enable_files_sync(False)
+        # be sure file sync is disabled
+
+        yield self.tool.enable_files_sync(True)
+        # assert that the services was started
+        self.assertEqual(called, ['start'])
+
+        config = tools.get_user_config()
+        self.assertEqual(True, config.get_files_sync_enabled())
+
+    @defer.inlineCallbacks
+    def test_disable_files_sync(self):
+        """Test for enable_files_sync."""
+        yield self.tool.enable_files_sync(False)
+        enabled = yield self.tool.is_files_sync_enabled()
+        self.assertFalse(enabled)
+
+    @defer.inlineCallbacks
+    def test_disable_files_sync_when_disabled(self):
+        """Test for enable_files_sync."""
+        yield self.tool.enable_files_sync(False)
+
+        yield self.tool.enable_files_sync(False)
+        enabled = yield self.tool.is_files_sync_enabled()
+        self.assertFalse(enabled)
+
+    @defer.inlineCallbacks
+    def test_disable_files_sync_when_enabled(self):
+        """Test for enable_files_sync."""
+        called = []
+        self.patch(self.tool, 'quit', lambda: called.append('quit'))
+        yield self.tool.enable_files_sync(True)
+        # be sure file sync is enabled
+
+        yield self.tool.enable_files_sync(False)
+        # assert that the services was stopped
+        self.assertEqual(called, ['quit'])
+
+        config = tools.get_user_config()
+        self.assertEqual(False, config.get_files_sync_enabled())
+
+    @defer.inlineCallbacks
     def test_refresh_volumes(self):
         """Test for refresh_volumes method."""
         d = defer.Deferred()

=== modified file 'ubuntuone/platform/linux/tools.py'
--- ubuntuone/platform/linux/tools.py	2011-03-01 20:57:23 +0000
+++ ubuntuone/platform/linux/tools.py	2011-04-04 15:36:35 +0000
@@ -732,11 +732,14 @@
         self.log.debug('is_files_sync_enabled')
         return get_user_config().get_files_sync_enabled()
 
+    @defer.inlineCallbacks
     def enable_files_sync(self, enabled):
         """Enable/disable files sync."""
-        self.log.debug('enable_files_sync %d', enabled)
         config = get_user_config()
-        if config.get_files_sync_enabled():
+        was_enabled = config.get_files_sync_enabled()
+        self.log.debug('enable_files_sync: enable? %r was enabled? %r',
+                       enabled, was_enabled)
+        if was_enabled:
             d = defer.Deferred()
             config_client = DBusClient(self.bus, '/config',
                                        DBUS_IFACE_CONFIG_NAME)
@@ -744,14 +747,16 @@
                                       enabled,
                                       reply_handler=d.callback,
                                       error_handler=d.errback)
-            config.set_files_sync_enabled(False)
-            return d
+            yield d
+            config.set_files_sync_enabled(enabled)
+            if not enabled:
+                # User requested the service to be disabled
+                self.quit()
         else:
             if enabled:
                 config.set_files_sync_enabled(True)
                 config.save()
                 self.start()
-            return defer.succeed(None)
 
     def refresh_volumes(self):
         """Call refresh_volumes method via DBus.