Merge lp:~facundo/ubuntuone-client/root-always-subscribed into lp:ubuntuone-client

[Facundo Batista]

Root is always subscribed (LP: #842839)

Root is always subscribed.

Added a class attribute 'subscribed' in True to Root, as we're now checking all volumes for subscription, and even as today Root has the subscribed attribute set in __init__ to True, old Root instances are pickled without it.

Other way to fix this would have been triggered a VolumeManager metadata upgrade, but the way I did it here is way safer (specially when verterok is on vacation).

Test included.

[Ian Wilkinson (theiw)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Nice fix

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-08-12 15:11:36 +0000
+++ tests/syncdaemon/test_vm.py	2011-09-06 18:49:23 +0000
@@ -1305,6 +1305,21 @@
                               'watch for %r should be present.' % path)
                 self.vm._remove_watch(path)
 
+    def test_support_old_root_without_subscribed(self):
+        """Old Roots were pickled without subscribed attribute."""
+        # generate the situation
+        old_attr = Root.subscribed
+        del Root.subscribed
+        root = Root(node_id='root_node_id')
+        del root.subscribed
+        assert not hasattr(root, 'subscribed')
+        serialized = cPickle.dumps(root)
+        Root.subscribed = old_attr
+
+        # unserialize
+        new_root = cPickle.loads(serialized)
+        self.assertTrue(new_root.subscribed)
+
 
 class VolumeManagerUnicodeTests(BaseVolumeManagerTests):
     """Tests for Volume Manager unicode capabilities."""

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-08-25 18:27:25 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-09-06 18:49:23 +0000
@@ -267,6 +267,8 @@
 class Root(Volume):
     """A volume representing the root."""
 
+    subscribed = True
+
     def __init__(self, volume_id=request.ROOT, node_id=None, path=None,
                  free_bytes=None, generation=None):
         """Create the Root."""