Merge lp:~verterok/ubuntuone-client/fix-684408 into lp:ubuntuone-client

[Guillermo Gonzalez]

Fix VM to correctly handle volumes and don't delete them.

Fix VM to correctly handle volumes.

[lp:~verterok/ubuntuone-client/fix-684408]

759. By Guillermo Gonzalez on 2010-12-03

fix comments

[Facundo Batista (facundo)]

Nice, thanks!

review: Approve

[Natalia Bidart (nataliabidart)]

Code looks great, and branch works perfectly. Tested carefully with Facundo's assistance.

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-12-01 20:10:29 +0000
+++ tests/syncdaemon/test_vm.py	2010-12-03 13:17:32 +0000
@@ -1220,7 +1220,8 @@
             self.assertEqual(os.path.join(self.home_dir, 'UDF'), udf.path)
         else:  # udf was not added to VM
             self.assertEqual(2, len(list(self.vm.get_volumes())))
-            self.assertEqual(0, len(self.vm.udfs)) # the new udf
+            self.assertEqual(1, len(self.vm.udfs)) # the new udf
+            self.assertFalse(self.vm.udfs.values()[0].active)
 
         self.assertEqual(2, len(self.vm.shares)) # the share and the root
         # check that the share is in the shares dict
@@ -1244,9 +1245,10 @@
             # root, share and udf
             self.assertEqual(1, len(self.vm.udfs)) # one udf
             self.assertEqual(3, len(list(self.vm.get_volumes())))
-        else:  # udf was not added to VM
+        else:  # udf was added to VM, but isn't active
             self.assertEqual(2, len(list(self.vm.get_volumes())))
-            self.assertEqual(0, len(self.vm.udfs)) # the new udf
+            self.assertEqual(1, len(self.vm.udfs)) # the new udf
+            self.assertFalse(self.vm.udfs.values()[0].active)
 
     @defer.inlineCallbacks
     def test_handle_AQ_LIST_VOLUMES_accepted_share_with_autosubscribe(self):
@@ -2573,6 +2575,25 @@
         self.assertEquals(udf.path, mdobj.path)
 
     @defer.inlineCallbacks
+    def test_volumes_rescan_cb_active_udf(self):
+        """Test _volumes_rescan_cb with an active UDF and no-autosubscribe."""
+        udf_id = uuid.uuid4()
+        udf, udf_volume = self._create_udf(udf_id, uuid.uuid4(), '~/UDF')
+        udf_volume.generation = 10
+        root_id = uuid.uuid4()
+        root_volume = volumes.RootVolume(root_id, 1, 500)
+        response = [udf_volume, root_volume]
+        yield self.vm.add_udf(udf)
+        # subscribe the udf
+        yield self.vm.subscribe_udf(udf.volume_id)
+        d = defer.Deferred()
+        self._listen_for('SV_VOLUME_NEW_GENERATION', d.callback, 1)
+        with environ('HOME', self.home_dir):
+            shares, udfs = self.vm._volumes_rescan_cb(response)
+            self.assertIn(udf.volume_id, udfs)
+        yield d
+
+    @defer.inlineCallbacks
     def test_update_generation(self):
         """Test for the update_generation method."""
         share_id = uuid.uuid4()

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-12-01 20:10:29 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-12-03 13:17:32 +0000
@@ -508,11 +508,9 @@
             except VolumeDoesNotExist:
                 # a new volume!
                 self.log.debug('New volume! id: %r', volume_id)
+                # if this is a UDF, _handle_new_volume will do a local
+                # rescan of the volume and activate it after that.
                 volume = self._handle_new_volume(new_volume)
-                # if this new volume is a UDF, it will be skipped as
-                # isn't active until the local rescan finish.
-                # It's safe to skip it as a rescan_from_scratch is
-                # executed after the local rescan.
             finally:
                 current_generation = volume.generation
 
@@ -536,8 +534,6 @@
                     events.append(('VM_SHARE_CREATED',
                                    dict(share_id=volume.volume_id)))
             elif isinstance(new_volume, UDFVolume):
-                if not autosubscribe:
-                    continue
                 # check if the fsm node exists, and create it if not
                 self._create_fsm_object(volume.path, volume.id, volume.node_id)
                 udfs.append(volume_id)