Merge lp:~nataliabidart/ubuntuone-client/quota-exceeded-and-none into lp:ubuntuone-client

[Natalia Bidart]

If free space is None, SYS_QUOTA_EXCEEDED is not pushed (LP: #671023).

[dobey (dobey)]

review: Approve

[Roman Yepishev (rye)]

Those docstrings puzzled me once too :)

review: Approve (code)

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2010-12-06 15:01:06 +0000
+++ tests/syncdaemon/test_action_queue.py	2010-12-09 13:42:51 +0000
@@ -23,6 +23,7 @@
 import base64
 from functools import wraps
 import logging
+import operator
 import os
 import shutil
 import unittest
@@ -3120,6 +3121,22 @@
         d.addCallback(check)
         return d
 
+    def test_have_sufficient_space_for_upload_if_free_space_is_none(self):
+        """Check have_sufficient_space_for_upload.
+
+        If free_space is None, SYS_QUOTA_EXCEEDED is not pushed.
+
+        """
+        self.patch(self.action_queue.main.vm, 'get_free_space',
+                   lambda share_id: None)  # free space is None
+        volume_id = 'test share'
+        res = self.action_queue.have_sufficient_space_for_upload(volume_id,
+                                                                 upload_size=1)
+        self.assertTrue(res, "Must have enough space to upload.")
+        events = map(operator.itemgetter(0),
+                     self.action_queue.event_queue.events)
+        self.assertNotIn('SYS_QUOTA_EXCEEDED', events)
+
     def test_have_sufficient_space_for_upload_if_no_free_space(self):
         """Check have_sufficient_space_for_upload pushes SYS_QUOTA_EXCEEDED."""
         self.patch(self.action_queue.main.vm, 'get_free_space',

=== modified file 'ubuntuone/platform/linux/dbus_interface.py'
--- ubuntuone/platform/linux/dbus_interface.py	2010-12-06 15:01:06 +0000
+++ ubuntuone/platform/linux/dbus_interface.py	2010-12-09 13:42:51 +0000
@@ -1461,7 +1461,7 @@
     @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
                          in_signature='b', out_signature='')
     def set_files_sync_enabled(self, enabled):
-        """Enable UDF autosubscribe."""
+        """Enable/disable file sync service."""
         logger.debug('called set_files_sync_enabled %d', enabled)
         user_config = config.get_user_config()
         user_config.set_files_sync_enabled(bool(int(enabled)))
@@ -1470,8 +1470,8 @@
     @dbus.service.method(DBUS_IFACE_CONFIG_NAME,
                          in_signature='', out_signature='b')
     def files_sync_enabled(self):
+        """Return the files_sync_enabled config value."""
         logger.debug('called files_sync_enabled')
-        """Return the udf_autosubscribe config value."""
         return config.get_user_config().get_files_sync_enabled()
 
 

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2010-12-06 15:01:06 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2010-12-09 13:42:51 +0000
@@ -662,7 +662,7 @@
     def have_sufficient_space_for_upload(self, share_id, upload_size):
         """Returns True if we have sufficient space for the given upload."""
         free = self.main.vm.get_free_space(share_id)
-        enough = free >= upload_size
+        enough = free is None or free >= upload_size
         if not enough:
             logger.info("Not enough space for upload %s bytes (available: %s)",
                         upload_size, free)