Merge lp:~verterok/ubuntuone-client/really-disable-throttling into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix syncdaemon exposed DBus Config.disable_bandwidth_throttling method

[Guillermo Gonzalez (verterok)]

Fix a silly bug in Syncdaemon DBus Config exposed method to disable bandwidth throttling.

[lp:~verterok/ubuntuone-client/really-disable-throttling]

278. By Guillermo Gonzalez on 2009-11-17

fix typo s/thorttling/throttling/

[Rick McBride (rmcbride)]

Looks good, thanks for fixing the self._set_thorttling_enabled stuff. Autocompletion kept it consistent anyhow :)

review: Approve

[Nicola Larosa (teknico)]

Wow, hideous bug. Thanks for the tests too.

review: Approve

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2009-11-06 19:31:17 +0000
+++ tests/syncdaemon/test_config.py	2009-11-17 21:45:22 +0000
@@ -31,6 +31,7 @@
 )
 from contrib.testing.testcase import (
     BaseTwistedTestCase,
+    DBusTwistedTestCase,
 )
 
 
@@ -293,3 +294,66 @@
         self.assertEquals('/hola', parser(bad_value))
         self.assertRaises(AttributeError, parser, invalid_value)
 
+
+class TestDBusConfig(DBusTwistedTestCase):
+
+    def setUp(self):
+        """Fake the user_config file, and setup all SD stuff"""
+        self.old_get_config_files = config.get_config_files
+        config.get_config_files = lambda: [os.path.join(os.environ['ROOT_DIR'],
+                                                   'data', 'syncdaemon.conf')]
+        return DBusTwistedTestCase.setUp(self)
+
+    def tearDown(self):
+        """cleanup everything, also the config module globals"""
+        config._user_config = None
+        config.get_config_files = self.old_get_config_files
+        return DBusTwistedTestCase.tearDown(self)
+
+    def test_get_throttling_limits(self):
+        """Test getting throttling limits"""
+        dbus_config = self.main.dbus_iface.config
+        limits = dbus_config.get_throttling_limits()
+        self.assertEquals(limits['download'], -1)
+        self.assertEquals(limits['upload'], -1)
+
+    def test_set_throttling_limits(self):
+        """Test setting throttling limits"""
+        dbus_config = self.main.dbus_iface.config
+        dbus_config.set_throttling_limits(10, 20)
+        limits = dbus_config.get_throttling_limits()
+        self.assertEquals(limits['download'], 10)
+        self.assertEquals(limits['upload'], 20)
+        conf = ConfigParser()
+        conf.read(config.get_user_config().config_file)
+        self.assertEquals(conf.get(config.THROTTLING, 'read_limit'), '10')
+        self.assertEquals(conf.get(config.THROTTLING, 'write_limit'), '20')
+
+    def test_enable_bandwidth_throttling(self):
+        """Test for enabling bandwidth throttling"""
+        dbus_config = self.main.dbus_iface.config
+        enabled = dbus_config.bandwidth_throttling_enabled()
+        self.assertFalse(enabled)
+        dbus_config.enable_bandwidth_throttling()
+        enabled = dbus_config.bandwidth_throttling_enabled()
+        self.assertTrue(enabled)
+        conf = ConfigParser()
+        conf.read(config.get_user_config().config_file)
+        self.assertEquals(conf.get(config.THROTTLING, 'on'), 'True')
+
+    def test_disable_bandwidth_throttling(self):
+        """Test for disabling bandwidth throttling"""
+        dbus_config = self.main.dbus_iface.config
+        enabled = dbus_config.bandwidth_throttling_enabled()
+        self.assertFalse(enabled)
+        # enable throttling
+        dbus_config.enable_bandwidth_throttling()
+        enabled = dbus_config.bandwidth_throttling_enabled()
+        self.assertTrue(enabled)
+        # now disable throttling and check
+        dbus_config.disable_bandwidth_throttling()
+        enabled = dbus_config.bandwidth_throttling_enabled()
+        self.assertFalse(enabled)
+        conf = ConfigParser()
+        conf.read(config.get_user_config().config_file)
+        self.assertEquals(conf.get(config.THROTTLING, 'on'), 'False')
 
=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2009-10-28 17:00:50 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2009-11-17 21:45:23 +0000
@@ -889,12 +889,7 @@
                                     error_handler=None):
         """Enable bandwidth throttling."""
         try:
-            # modify and save the config file
-            config = get_user_config()
-            config.set_throttling(True)
-            config.save()
-            # modify AQ settings
-            self.dbus_iface.action_queue.enable_throttling(True)
+            self._set_throttling_enabled(True)
             if reply_handler:
                 reply_handler()
             # pylint: disable-msg=W0703
@@ -911,12 +906,7 @@
                                      error_handler=None):
         """Disable bandwidth throttling."""
         try:
-            # modify and save the config file
-            config = get_user_config()
-            config.set_throttling(True)
-            config.save()
-            # modify AQ settings
-            self.dbus_iface.action_queue.enable_throttling(False)
+            self._set_throttling_enabled(False)
             if reply_handler:
                 reply_handler()
             # pylint: disable-msg=W0703
@@ -926,6 +916,15 @@
             else:
                 raise
 
+    def _set_throttling_enabled(self, enabled):
+        """set throttling enabled value and save the config"""
+        # modify and save the config file
+        config = get_user_config()
+        config.set_throttling(enabled)
+        config.save()
+        # modify AQ settings
+        self.dbus_iface.action_queue.enable_throttling(enabled)
+
     @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
                          in_signature='', out_signature='b',
                          async_callbacks=('reply_handler', 'error_handler'))