Merge lp:~verterok/ubuntuone-client/fix-664019-stable-1-4 into lp:ubuntuone-client/stable-1-4

[Guillermo Gonzalez]

Trigger a rescan_from_scratch on SV_VOLUME_CREATED in order to get the contents (instead of just the volume).

Correclty handle SV_VOLUME_CREATED event and trigger a rescan_from_scratch on the volume in order to get the contents (instead of just the volume)

[Lucio Torre (lucio.torre)]

review: Approve

[Facundo Batista (facundo)]

Nice!

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-09-28 00:06:20 +0000
+++ tests/syncdaemon/test_vm.py	2010-10-20 20:41:25 +0000
@@ -1759,12 +1759,12 @@
         self.assertTrue(called)
         self.assertTrue(self.handler.check_warning("missing volume id"))
 
+    @defer.inlineCallbacks
     def _test_handle_SV_VOLUME_CREATED(self, auto_subscribe):
         """Test for handle_SV_VOLUME_CREATED."""
         user_conf = config.get_user_config()
         user_conf.set_udf_autosubscribe(auto_subscribe)
         # start the test
-        d = defer.Deferred()
         udf_id = uuid.uuid4()
         udf_volume = volumes.UDFVolume(udf_id, 'udf_uuid', None, 10, u'~/ñoño')
         share_id = uuid.uuid4()
@@ -1774,39 +1774,43 @@
                                            True, 'View')
         # initialize the the root
         self.vm._got_root('root_uuid')
+
+        d = defer.Deferred()
         self._listen_for('VM_UDF_CREATED', d.callback)
-        def check_udf(info):
-            """The udf creation callback"""
-            udf = info[0]
-            self.assertEquals(udf.volume_id, str(udf_id))
-            self.assertIn(str(udf_id), self.vm.udfs)
-            if auto_subscribe:
-                self.assertTrue(udf.subscribed)
-                self.assertTrue(os.path.exists(udf.path))
-            else:
-                self.assertFalse(udf.subscribed)
-                self.assertFalse(os.path.exists(udf.path))
-            # subscribe a new listener
-            d = defer.Deferred()
-            self._listen_for('VM_SHARE_CREATED', d.callback)
-            # fire SV_VOLUME_CREATED with a share
-            with environ('HOME', self.home_dir):
-                self.vm.handle_SV_VOLUME_CREATED(share_volume)
-            return d
-
-        def check_share(info):
-            """The share creation callback."""
-            share_id = info[0]
-            share = self.vm.get_volume(share_id)
-            self.assertEquals(share.volume_id, str(share_id))
-            self.assertIn(str(share_id), self.vm.shares)
-
-        d.addCallback(check_udf)
-        d.addCallback(check_share)
-        # use a custom home
+        rescan_cb = defer.Deferred()
+        self.patch(self.main.action_q, 'rescan_from_scratch', rescan_cb.callback)
+
         with environ('HOME', self.home_dir):
             self.vm.handle_SV_VOLUME_CREATED(udf_volume)
-        return d
+        info = yield d
+        udf = info[0]
+        self.assertEquals(udf.volume_id, str(udf_id))
+        self.assertIn(str(udf_id), self.vm.udfs)
+        if auto_subscribe:
+            self.assertTrue(udf.subscribed)
+            self.assertTrue(os.path.exists(udf.path))
+            # check that rescan_from_scratch is called
+            vol_id = yield rescan_cb
+            self.assertEqual(vol_id, udf.volume_id)
+        else:
+            self.assertFalse(udf.subscribed)
+            self.assertFalse(os.path.exists(udf.path))
+        # subscribe a new listener
+        d = defer.Deferred()
+        self._listen_for('VM_SHARE_CREATED', d.callback)
+        rescan_cb = defer.Deferred()
+        self.patch(self.main.action_q, 'rescan_from_scratch', rescan_cb.callback)
+        # fire SV_VOLUME_CREATED with a share
+        with environ('HOME', self.home_dir):
+            self.vm.handle_SV_VOLUME_CREATED(share_volume)
+        info = yield d
+        share_id = info[0]
+        share = self.vm.get_volume(share_id)
+        self.assertEquals(share.volume_id, str(share_id))
+        self.assertIn(str(share_id), self.vm.shares)
+        # check that rescan_from_scratch is called
+        vol_id = yield rescan_cb
+        self.assertEqual(vol_id, share.volume_id)
 
     def test_handle_SV_VOLUME_CREATED_subscribe(self):
         """Test SV_VOLUME_CREATED with udf auto_subscribe """

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-09-28 00:06:20 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-10-20 20:41:25 +0000
@@ -1235,7 +1235,10 @@
 
     def handle_SV_VOLUME_CREATED(self, volume):
         """Handle SV_VOLUME_CREATED event."""
-        self._handle_new_volume(volume)
+        vol = self._handle_new_volume(volume)
+        if vol and vol.active:
+            self.m.action_q.rescan_from_scratch(vol.volume_id)
+
 
     def handle_SV_VOLUME_DELETED(self, volume_id):
         """Handle SV_VOLUME_DELETED event."""